Skip to content

Commit ffae6ab

Browse files
nkastnkast
authored
Ver3.13.9001 (#1757)
* Projects ver3.13.9001 * Packages ver3.13.9001 * Templates ver3.12.9001 * Changelog ver3.13.9001 * Migrate ver3.13.9001
1 parent e705eeb commit ffae6ab

File tree

56 files changed

+499
-301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+499
-301
lines changed

‎BuildNuget.bat‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ dotnet pack src\Xna.Framework.Content.Pipeline.Audio\Xna.Framework.Content.Pipel
1212
dotnet pack src\Xna.Framework.Content.Pipeline.Graphics\Xna.Framework.Content.Pipeline.Graphics.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
1313
dotnet pack src\Xna.Framework.Content.Pipeline.Media\Xna.Framework.Content.Pipeline.Media.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
1414

15-
"C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/Content.Pipeline.Builder.nuspec -OutputDirectory NuGetPackages\Output\ -BasePath . -Version 3.12.9001 -Properties Configuration=Release
16-
"C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/Content.Pipeline.Builder.Windows.nuspec -OutputDirectory NuGetPackages\Output\ -BasePath . -Version 3.12.9001 -Properties Configuration=Release
15+
"C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/Content.Pipeline.Builder.nuspec -OutputDirectory NuGetPackages\Output\ -BasePath . -Version 3.13.9001 -Properties Configuration=Release
16+
"C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/Content.Pipeline.Builder.Windows.nuspec -OutputDirectory NuGetPackages\Output\ -BasePath . -Version 3.13.9001 -Properties Configuration=Release
1717

18-
"C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/MonoGame.Framework.Android.nuspec -OutputDirectory NuGetPackages\Output\ -BasePath . -Version 3.12.9001.0 -Properties Configuration=Release
19-
"C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/MonoGame.Framework.iOS.nuspec -OutputDirectory NuGetPackages\Output\ -BasePath . -Version 3.12.9001.1 -Properties Configuration=Release
20-
"C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/MonoGame.Framework.WindowsUniversal.nuspec -OutputDirectory NuGetPackages\Output\ -BasePath . -Version 3.12.9001.1 -Properties Configuration=Release
18+
"C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/MonoGame.Framework.Android.nuspec -OutputDirectory NuGetPackages\Output\ -BasePath . -Version 3.13.9001.0 -Properties Configuration=Release
19+
"C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/MonoGame.Framework.iOS.nuspec -OutputDirectory NuGetPackages\Output\ -BasePath . -Version 3.13.9001.0 -Properties Configuration=Release
20+
"C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/MonoGame.Framework.WindowsUniversal.nuspec -OutputDirectory NuGetPackages\Output\ -BasePath . -Version 3.13.9001.0 -Properties Configuration=Release
2121

2222
dotnet pack Platforms\Xna.Framework.WindowsDX11.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
2323
dotnet pack Platforms\Xna.Framework.DesktopGL.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release

‎CHANGELOG.md‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,58 @@
11
# Changelog
22

3+
## 3.13.9001 Release - July 24, 2024
4+
5+
### Fixed
6+
- fix GamePadCapabilities #1565
7+
- [iOS] fix Game.Services NullReferenceException #1607
8+
- [SDL] fix JoystickCapabilities.IsGamepad #1626
9+
- [ANDROID] fix Keyboard #1688
10+
- fix templates .mgcb file creation #1693
11+
- Fix templates projectname #1694
12+
- fix BlazorGL template alpha blend #1695
13+
- [DX11] fix NonPowerOfTwoUnusedTextureShouldNotThrow test #1701
14+
- [GL] fix NonPowerOfTwoUnusedTextureShouldNotThrow test #1702
15+
- [EffectProcessor] inorder samplers merge #1709
16+
- [EffectProcessor] fix ShaderProfileDX11 samplerSlot #1710
17+
- fix CreateGamePadCapabilities #1713
18+
- fix ResourceNameAlphaTestEffect #1724
19+
- [BlazorGL] fix MediaPlayer IsRepeating #1726
20+
- [SDL] early Joysticks initialization #1735
21+
- [BlazorGL] clear KeyboardState on focus lost #1736
22+
- [BlazorGL] fix Keyboard special keys #1738
23+
- fix MGCB builds with no response file #1745
24+
25+
### Performance
26+
- optimize ConcreteTextureCollection.PlatformApply() #1605
27+
- perf use HashSet for ContentManager _disposableAssets #1711
28+
- [Android] reduce FromEGLConfig() allocations #1583
29+
- [GL] use HashSet for GL Extensions #1587
30+
- [GL] optimized PlatformApplyVertexBuffers() #1604, #1673
31+
- [GL] discard VertexBuffer in SpriteBatcher #1636
32+
- [OpenGL] remove glFinish() from Texture2D.SetData() #1638
33+
- [OpenGL] use DrawRangeElements #1703
34+
- [SDL] cache JoystickCapabilities #1625
35+
- [SDL] cache GamePadCapabilities #1630
36+
- [SDL] reduce Vorbis MediaPlayer allocations #1680
37+
- [SDL] reuse Vorbis reader for Song Repeat #1684
38+
39+
### Changed
40+
- [EffectProcessor] Shader Model 1.x error message #1722
41+
- [BlazorGL] implemented DrawUserPrimitives and DrawUserIndexedPrimitives with vertexOffset #1723
42+
- [BlazorGL] implemented GamePad #1730
43+
- [BlazorGL] implemented TouchPanelCapabilities MaximumTouchCount and IsConnected #1731
44+
- [BlazorGL] implemented Medium quality SoundEfects (MsAdpcm) #1748
45+
- [BlazorGL] implemented SoundEffect.FromStream() #1749
46+
- [BlazorGL] implemented Buffers SetData(...) with startIndex #1753
47+
- [BlazorGL] implemented HiDef and WebGL2 #1756
48+
49+
### Added
50+
51+
### Removed
52+
- VS2019 templates removed #1631
53+
- Xamarin templates removed #1632
54+
- removed GamePadState.Default #1650, #1651, #1653
55+
356
## 3.12.9001 Release - May 12, 2024
457

558
### Fixed

‎Documentation/articles/migrate_381.md‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Migrating from MonoGame 3.8.1 to KNI 3.12
1+
# Migrating from MonoGame 3.8.1 to KNI 3.13
22

33

44
## Migrating Framework
@@ -12,14 +12,14 @@ Edit your .csproj file of the main project and replace:
1212
to:
1313

1414
```xml
15-
<PackageReference Include="nkast.Xna.Framework" Version="3.12.9001" />
16-
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.12.9001" />
17-
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.12.9001" />
18-
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.12.9001" />
19-
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.12.9001" />
20-
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.12.9001" />
21-
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.12.9001" />
22-
<PackageReference Include="MonoGame.Framework.{Platform}.9000" Version="3.12.9001" />
15+
<PackageReference Include="nkast.Xna.Framework" Version="3.13.9001" />
16+
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.13.9001" />
17+
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.13.9001" />
18+
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.13.9001" />
19+
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.13.9001" />
20+
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.13.9001" />
21+
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.13.9001" />
22+
<PackageReference Include="MonoGame.Framework.{Platform}.9000" Version="3.13.9001" />
2323
```
2424

2525
where {Platform} is Windows, DesktopGL, Android, etc.
@@ -33,13 +33,13 @@ For libraries, edit your .csproj file and replace:
3333
to:
3434

3535
```xml
36-
<PackageReference Include="nkast.Xna.Framework" Version="3.12.9001" />
37-
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.12.9001" />
38-
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.12.9001" />
39-
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.12.9001" />
40-
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.12.9001" />
41-
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.12.9001" />
42-
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.12.9001" />
36+
<PackageReference Include="nkast.Xna.Framework" Version="3.13.9001" />
37+
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.13.9001" />
38+
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.13.9001" />
39+
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.13.9001" />
40+
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.13.9001" />
41+
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.13.9001" />
42+
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.13.9001" />
4343
```
4444

4545
### Migrating Framework (Android)
@@ -78,7 +78,7 @@ Then replace:
7878
With:
7979

8080
```xml
81-
<PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.12.9001" />
81+
<PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.13.9001" />
8282
```
8383

8484
Then rename 'MonoGameContentReference':

‎Documentation/articles/migrate_3_12.md‎

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
# Migrating from 3.12 to 3.13
2+
3+
4+
## Migrating Framework
5+
6+
Edit your .csproj file and replace:
7+
8+
```xml
9+
<PackageReference Include="nkast.Xna.Framework" Version="3.12.9002" />
10+
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.12.9002" />
11+
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.12.9002" />
12+
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.12.9002" />
13+
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.12.9002" />
14+
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.12.9001" />
15+
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.12.9001" />
16+
<PackageReference Include="MonoGame.Framework.{Platform}.9000" Version="3.12.9002" />
17+
```
18+
19+
to:
20+
21+
```xml
22+
<PackageReference Include="nkast.Xna.Framework" Version="3.13.9001" />
23+
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.13.9001" />
24+
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.13.9001" />
25+
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.13.9001" />
26+
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.13.9001" />
27+
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.13.9001" />
28+
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.13.9001" />
29+
<PackageReference Include="MonoGame.Framework.{Platform}.9000" Version="3.13.9001" />
30+
```
31+
32+
For libraries, edit your .csproj file and replace:
33+
34+
```xml
35+
<PackageReference Include="nkast.Xna.Framework" Version="3.12.9002" />
36+
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.12.9002" />
37+
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.12.9002" />
38+
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.12.9002" />
39+
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.12.9002" />
40+
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.12.9001" />
41+
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.12.9001" />
42+
```
43+
44+
to:
45+
46+
```xml
47+
<PackageReference Include="nkast.Xna.Framework" Version="3.13.9001" />
48+
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.13.9001" />
49+
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.13.9001" />
50+
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.13.9001" />
51+
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.13.9001" />
52+
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.13.9001" />
53+
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.13.9001" />
54+
```
55+
56+
## Migrating Content Builder
57+
58+
Edit your .csproj file and replace:
59+
60+
```xml
61+
<ItemGroup>
62+
<PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.12.9002" />
63+
</ItemGroup>
64+
```
65+
66+
to:
67+
68+
```xml
69+
<ItemGroup>
70+
<PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.13.9001" />
71+
</ItemGroup>
72+
```
73+
74+
if your importers require Windows libraries (WinForms,WPF), use the 'nkast.Xna.Framework.Content.Pipeline.Builder.Windows' package.
75+
76+
77+
### Migrating BlazorGL projects
78+
79+
Edit your .csproj file and replace:
80+
81+
```xml
82+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
83+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.27" />
84+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.27" PrivateAssets="all" />
85+
</ItemGroup>
86+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
87+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
88+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.2" PrivateAssets="all" />
89+
</ItemGroup>
90+
```
91+
92+
with:
93+
94+
```xml
95+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
96+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.32" />
97+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.32" PrivateAssets="all" />
98+
</ItemGroup>
99+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
100+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.7" />
101+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.7" PrivateAssets="all" />
102+
</ItemGroup>
103+
```
104+
105+
Edit index.html file and replace:
106+
107+
```
108+
<script src="_content/nkast.Wasm.Dom/js/JSObject.8.0.0.js"></script>
109+
<script src="_content/nkast.Wasm.Dom/js/Window.8.0.0.js"></script>
110+
<script src="_content/nkast.Wasm.Dom/js/Document.8.0.0.js"></script>
111+
<script src="_content/nkast.Wasm.Dom/js/Media.8.0.0.js"></script>
112+
<script src="_content/nkast.Wasm.XHR/js/XHR.8.0.0.js"></script>
113+
<script src="_content/nkast.Wasm.Canvas/js/Canvas.8.0.0.js"></script>
114+
<script src="_content/nkast.Wasm.Canvas/js/CanvasGLContext.8.0.0.js"></script>
115+
<script src="_content/nkast.Wasm.Audio/js/Audio.8.0.0.js"></script>
116+
```
117+
118+
with:
119+
120+
```
121+
<script src="_content/nkast.Wasm.Dom/js/JSObject.8.0.1.js"></script>
122+
<script src="_content/nkast.Wasm.Dom/js/Window.8.0.1.js"></script>
123+
<script src="_content/nkast.Wasm.Dom/js/Document.8.0.1.js"></script>
124+
<script src="_content/nkast.Wasm.Dom/js/Navigator.8.0.1.js"></script>
125+
<script src="_content/nkast.Wasm.Dom/js/Gamepad.8.0.1.js"></script>
126+
<script src="_content/nkast.Wasm.Dom/js/Media.8.0.1.js"></script>
127+
<script src="_content/nkast.Wasm.XHR/js/XHR.8.0.1.js"></script>
128+
<script src="_content/nkast.Wasm.Canvas/js/Canvas.8.0.1.js"></script>
129+
<script src="_content/nkast.Wasm.Canvas/js/CanvasGLContext.8.0.1.js"></script>
130+
<script src="_content/nkast.Wasm.Audio/js/Audio.8.0.1.js"></script>
131+
```
132+
133+
### Migrating OculusVR projects
134+
135+
Edit your .csproj file and replace:
136+
137+
```xml
138+
<PackageReference Include="nkast.Xna.Framework.Oculus.OvrDX11" Version="3.12.9001" />
139+
```
140+
141+
with:
142+
143+
```xml
144+
<PackageReference Include="nkast.Xna.Framework.Oculus.OvrDX11" Version="3.13.9002" />
145+
```

‎Installers/default.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<property name="os" value="${operating-system::get-platform(environment::get-operating-system())}" />
55

66
<!-- The build version number we can get from the environment variable -->
7-
<property name="buildNumber" value="3.12.9001.0"/>
7+
<property name="buildNumber" value="3.13.9001.0"/>
88
<if test="${environment::variable-exists('BUILD_NUMBER')}">
99
<property name="buildNumber" value="${environment::get-variable('BUILD_NUMBER')}"/>
1010
</if>

0 commit comments

Comments
 (0)