Skip to content

Commit

Permalink
Ver3.13.9001 (#1757)
Browse files Browse the repository at this point in the history
* Projects ver3.13.9001

* Packages ver3.13.9001

* Templates ver3.12.9001

* Changelog ver3.13.9001

* Migrate ver3.13.9001
  • Loading branch information
nkast authored Jul 24, 2024
1 parent e705eeb commit ffae6ab
Show file tree
Hide file tree
Showing 56 changed files with 499 additions and 301 deletions.
10 changes: 5 additions & 5 deletions BuildNuget.bat
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ dotnet pack src\Xna.Framework.Content.Pipeline.Audio\Xna.Framework.Content.Pipel
dotnet pack src\Xna.Framework.Content.Pipeline.Graphics\Xna.Framework.Content.Pipeline.Graphics.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
dotnet pack src\Xna.Framework.Content.Pipeline.Media\Xna.Framework.Content.Pipeline.Media.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release

"C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/Content.Pipeline.Builder.nuspec -OutputDirectory NuGetPackages\Output\ -BasePath . -Version 3.12.9001 -Properties Configuration=Release
"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
"C:\Program Files (x86)\NuGet3\nuget.exe" pack NuGetPackages/Content.Pipeline.Builder.nuspec -OutputDirectory NuGetPackages\Output\ -BasePath . -Version 3.13.9001 -Properties Configuration=Release
"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

"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
"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
"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
"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
"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
"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

dotnet pack Platforms\Xna.Framework.WindowsDX11.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
dotnet pack Platforms\Xna.Framework.DesktopGL.csproj --output NuGetPackages\Output\ /t:Build /p:Configuration=Release
Expand Down
53 changes: 53 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,58 @@
# Changelog

## 3.13.9001 Release - July 24, 2024

### Fixed
- fix GamePadCapabilities #1565
- [iOS] fix Game.Services NullReferenceException #1607
- [SDL] fix JoystickCapabilities.IsGamepad #1626
- [ANDROID] fix Keyboard #1688
- fix templates .mgcb file creation #1693
- Fix templates projectname #1694
- fix BlazorGL template alpha blend #1695
- [DX11] fix NonPowerOfTwoUnusedTextureShouldNotThrow test #1701
- [GL] fix NonPowerOfTwoUnusedTextureShouldNotThrow test #1702
- [EffectProcessor] inorder samplers merge #1709
- [EffectProcessor] fix ShaderProfileDX11 samplerSlot #1710
- fix CreateGamePadCapabilities #1713
- fix ResourceNameAlphaTestEffect #1724
- [BlazorGL] fix MediaPlayer IsRepeating #1726
- [SDL] early Joysticks initialization #1735
- [BlazorGL] clear KeyboardState on focus lost #1736
- [BlazorGL] fix Keyboard special keys #1738
- fix MGCB builds with no response file #1745

### Performance
- optimize ConcreteTextureCollection.PlatformApply() #1605
- perf use HashSet for ContentManager _disposableAssets #1711
- [Android] reduce FromEGLConfig() allocations #1583
- [GL] use HashSet for GL Extensions #1587
- [GL] optimized PlatformApplyVertexBuffers() #1604, #1673
- [GL] discard VertexBuffer in SpriteBatcher #1636
- [OpenGL] remove glFinish() from Texture2D.SetData() #1638
- [OpenGL] use DrawRangeElements #1703
- [SDL] cache JoystickCapabilities #1625
- [SDL] cache GamePadCapabilities #1630
- [SDL] reduce Vorbis MediaPlayer allocations #1680
- [SDL] reuse Vorbis reader for Song Repeat #1684

### Changed
- [EffectProcessor] Shader Model 1.x error message #1722
- [BlazorGL] implemented DrawUserPrimitives and DrawUserIndexedPrimitives with vertexOffset #1723
- [BlazorGL] implemented GamePad #1730
- [BlazorGL] implemented TouchPanelCapabilities MaximumTouchCount and IsConnected #1731
- [BlazorGL] implemented Medium quality SoundEfects (MsAdpcm) #1748
- [BlazorGL] implemented SoundEffect.FromStream() #1749
- [BlazorGL] implemented Buffers SetData(...) with startIndex #1753
- [BlazorGL] implemented HiDef and WebGL2 #1756

### Added

### Removed
- VS2019 templates removed #1631
- Xamarin templates removed #1632
- removed GamePadState.Default #1650, #1651, #1653

## 3.12.9001 Release - May 12, 2024

### Fixed
Expand Down
34 changes: 17 additions & 17 deletions Documentation/articles/migrate_381.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Migrating from MonoGame 3.8.1 to KNI 3.12
# Migrating from MonoGame 3.8.1 to KNI 3.13


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

```xml
<PackageReference Include="nkast.Xna.Framework" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.12.9001" />
<PackageReference Include="MonoGame.Framework.{Platform}.9000" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.13.9001" />
<PackageReference Include="MonoGame.Framework.{Platform}.9000" Version="3.13.9001" />
```

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

```xml
<PackageReference Include="nkast.Xna.Framework" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.13.9001" />
```

### Migrating Framework (Android)
Expand Down Expand Up @@ -78,7 +78,7 @@ Then replace:
With:

```xml
<PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.13.9001" />
```

Then rename 'MonoGameContentReference':
Expand Down
145 changes: 145 additions & 0 deletions Documentation/articles/migrate_3_12.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
# Migrating from 3.12 to 3.13


## Migrating Framework

Edit your .csproj file and replace:

```xml
<PackageReference Include="nkast.Xna.Framework" Version="3.12.9002" />
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.12.9002" />
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.12.9002" />
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.12.9002" />
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.12.9002" />
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.12.9001" />
<PackageReference Include="MonoGame.Framework.{Platform}.9000" Version="3.12.9002" />
```

to:

```xml
<PackageReference Include="nkast.Xna.Framework" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.13.9001" />
<PackageReference Include="MonoGame.Framework.{Platform}.9000" Version="3.13.9001" />
```

For libraries, edit your .csproj file and replace:

```xml
<PackageReference Include="nkast.Xna.Framework" Version="3.12.9002" />
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.12.9002" />
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.12.9002" />
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.12.9002" />
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.12.9002" />
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.12.9001" />
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.12.9001" />
```

to:

```xml
<PackageReference Include="nkast.Xna.Framework" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Content" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Media" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Input" Version="3.13.9001" />
<PackageReference Include="nkast.Xna.Framework.Game" Version="3.13.9001" />
```

## Migrating Content Builder

Edit your .csproj file and replace:

```xml
<ItemGroup>
<PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.12.9002" />
</ItemGroup>
```

to:

```xml
<ItemGroup>
<PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.13.9001" />
</ItemGroup>
```

if your importers require Windows libraries (WinForms,WPF), use the 'nkast.Xna.Framework.Content.Pipeline.Builder.Windows' package.


### Migrating BlazorGL projects

Edit your .csproj file and replace:

```xml
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.27" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.27" PrivateAssets="all" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.2" PrivateAssets="all" />
</ItemGroup>
```

with:

```xml
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.32" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.32" PrivateAssets="all" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.7" PrivateAssets="all" />
</ItemGroup>
```

Edit index.html file and replace:

```
<script src="_content/nkast.Wasm.Dom/js/JSObject.8.0.0.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Window.8.0.0.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Document.8.0.0.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Media.8.0.0.js"></script>
<script src="_content/nkast.Wasm.XHR/js/XHR.8.0.0.js"></script>
<script src="_content/nkast.Wasm.Canvas/js/Canvas.8.0.0.js"></script>
<script src="_content/nkast.Wasm.Canvas/js/CanvasGLContext.8.0.0.js"></script>
<script src="_content/nkast.Wasm.Audio/js/Audio.8.0.0.js"></script>
```

with:

```
<script src="_content/nkast.Wasm.Dom/js/JSObject.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Window.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Document.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Navigator.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Gamepad.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Dom/js/Media.8.0.1.js"></script>
<script src="_content/nkast.Wasm.XHR/js/XHR.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Canvas/js/Canvas.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Canvas/js/CanvasGLContext.8.0.1.js"></script>
<script src="_content/nkast.Wasm.Audio/js/Audio.8.0.1.js"></script>
```

### Migrating OculusVR projects

Edit your .csproj file and replace:

```xml
<PackageReference Include="nkast.Xna.Framework.Oculus.OvrDX11" Version="3.12.9001" />
```

with:

```xml
<PackageReference Include="nkast.Xna.Framework.Oculus.OvrDX11" Version="3.13.9002" />
```
2 changes: 1 addition & 1 deletion Installers/default.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<property name="os" value="${operating-system::get-platform(environment::get-operating-system())}" />

<!-- The build version number we can get from the environment variable -->
<property name="buildNumber" value="3.12.9001.0"/>
<property name="buildNumber" value="3.13.9001.0"/>
<if test="${environment::variable-exists('BUILD_NUMBER')}">
<property name="buildNumber" value="${environment::get-variable('BUILD_NUMBER')}"/>
</if>
Expand Down
Loading

0 comments on commit ffae6ab

Please sign in to comment.