Skip to content

Commit

Permalink
Rename Platform assembly (#2146)
Browse files Browse the repository at this point in the history
* rename Platform assembly

* DocumentationFile

* nugets
  • Loading branch information
nkast authored Dec 25, 2024
1 parent 59f43e8 commit 2b772cc
Show file tree
Hide file tree
Showing 23 changed files with 36 additions and 36 deletions.
10 changes: 5 additions & 5 deletions NuGetPackages/MonoGame.Framework.Android.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
<file src="Platforms\build\.Android\Xna.Framework.Platform.Android.targets" target="build\Xna.Framework.Platform.Android.targets" />

<!-- C# Assemblies (.mono) -->
<file src="Platforms\bin\Android\AnyCPU\Release\Xna.Platform.dll" target="lib\MonoAndroid\Xna.Platform.dll" />
<file src="Platforms\bin\Android\AnyCPU\Release\Xna.Platform.xml" target="lib\MonoAndroid\Xna.Platform.xml" />
<file src="Platforms\bin\Android\AnyCPU\Release\Kni.Platform.dll" target="lib\MonoAndroid\Kni.Platform.dll" />
<file src="Platforms\bin\Android\AnyCPU\Release\Kni.Platform.xml" target="lib\MonoAndroid\Kni.Platform.xml" />

<!-- C# Assemblies (.netcore) -->
<file src="Artifacts\Platforms\Android\Release\net8.0-android\Xna.Platform.aar" target="lib\net8.0-android\Xna.Platform.aar" />
<file src="Artifacts\Platforms\Android\Release\net8.0-android\Xna.Platform.dll" target="lib\net8.0-android\MXna.Platform.dll" />
<file src="Artifacts\Platforms\Android\Release\net8.0-android\Xna.Platform.xml" target="lib\net8.0-android\Xna.Platform.xml" />
<file src="Artifacts\Platforms\Android\Release\net8.0-android\Kni.Platform.aar" target="lib\net8.0-android\Kni.Platform.aar" />
<file src="Artifacts\Platforms\Android\Release\net8.0-android\Kni.Platform.dll" target="lib\net8.0-android\Kni.Platform.dll" />
<file src="Artifacts\Platforms\Android\Release\net8.0-android\Kni.Platform.xml" target="lib\net8.0-android\Kni.Platform.xml" />

<!-- Nuget Icon -->
<file src="Images\Icon.png" target="\" />
Expand Down
6 changes: 3 additions & 3 deletions NuGetPackages/MonoGame.Framework.WindowsUniversal.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
<files>
<file src="Platforms\build\.UAP\Xna.Framework.Platform.UAP.targets" target="build\Xna.Framework.Platform.UAP.targets" />

<file src="Platforms\bin\WindowsUniversal\AnyCPU\Release\Xna.Platform.dll" target="lib\netcore\Xna.Platform.dll" />
<file src="Platforms\bin\WindowsUniversal\AnyCPU\Release\Xna.Platform.pri" target="lib\netcore\Xna.Platform.pri" />
<file src="Platforms\bin\WindowsUniversal\AnyCPU\Release\Xna.Platform.xml" target="lib\netcore\Xna.Platform.xml" />
<file src="Platforms\bin\WindowsUniversal\AnyCPU\Release\Kni.Platform.dll" target="lib\netcore\Kni.Platform.dll" />
<file src="Platforms\bin\WindowsUniversal\AnyCPU\Release\Kni.Platform.pri" target="lib\netcore\Kni.Platform.pri" />
<file src="Platforms\bin\WindowsUniversal\AnyCPU\Release\Kni.Platform.xml" target="lib\netcore\Kni.Platform.xml" />

<!-- Nuget Icon -->
<file src="Images\Icon.png" target="\" />
Expand Down
8 changes: 4 additions & 4 deletions NuGetPackages/MonoGame.Framework.iOS.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
<file src="Platforms\build\.iOS\Xna.Framework.Platform.iOS.targets" target="build\Xna.Framework.Platform.iOS.targets" />

<!-- C# Assemblies (.mono) -->
<file src="Artifacts\Platforms\iOS\Release\xamarinios10\Xna.Platform.dll" target="lib\XamariniOS\Xna.Platform.dll" />
<file src="Artifacts\Platforms\iOS\Release\xamarinios10\Xna.Platform.xml" target="lib\XamariniOS\Xna.Platform.xml" />
<file src="Artifacts\Platforms\iOS\Release\xamarinios10\Kni.Platform.dll" target="lib\XamariniOS\Kni.Platform.dll" />
<file src="Artifacts\Platforms\iOS\Release\xamarinios10\Kni.Platform.xml" target="lib\XamariniOS\Kni.Platform.xml" />

<!-- C# Assemblies (.netcore) -->
<file src="Artifacts\Platforms\iOS\Release\net8.0-ios\Xna.Platform.dll" target="lib\net8.0-ios\Xna.Platform.dll" />
<file src="Artifacts\Platforms\iOS\Release\net8.0-ios\Xna.Platform.xml" target="lib\net8.0-ios\Xna.Platform.xml" />
<file src="Artifacts\Platforms\iOS\Release\net8.0-ios\Kni.Platform.dll" target="lib\net8.0-ios\Kni.Platform.dll" />
<file src="Artifacts\Platforms\iOS\Release\net8.0-ios\Kni.Platform.xml" target="lib\net8.0-ios\Kni.Platform.xml" />

<!-- Nuget Icon -->
<file src="Images\Icon.png" target="\" />
Expand Down
6 changes: 3 additions & 3 deletions Platforms/Kni.Platform.Android.GL.Xamarin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.Xna.Framework</RootNamespace>
<AssemblyName>Xna.Platform</AssemblyName>
<AssemblyName>Kni.Platform</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>CS0067;CS1591;CS1574;CS0419;CS8500</NoWarn>
<TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
Expand All @@ -30,7 +30,7 @@
<EnableUnmanagedDebugging>true</EnableUnmanagedDebugging>
<OutputPath>bin\Android\AnyCPU\Debug</OutputPath>
<IntermediateOutputPath>obj\Android\AnyCPU\Debug</IntermediateOutputPath>
<DocumentationFile>bin\Android\AnyCPU\Debug\Xna.Platform.xml</DocumentationFile>
<DocumentationFile>bin\Android\AnyCPU\Debug\Kni.Platform.xml</DocumentationFile>
<DefineConstants>DEBUG;OPENGL;OPENAL;TRACE;ANDROID;GLES;STBSHARP_INTERNAL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand All @@ -43,7 +43,7 @@
<DebugType>none</DebugType>
<OutputPath>bin\Android\AnyCPU\Release</OutputPath>
<IntermediateOutputPath>obj\Android\AnyCPU\Release</IntermediateOutputPath>
<DocumentationFile>bin\Android\AnyCPU\Release\Xna.Platform.xml</DocumentationFile>
<DocumentationFile>bin\Android\AnyCPU\Release\Kni.Platform.xml</DocumentationFile>
<DefineConstants>OPENGL;OPENAL;TRACE;ANDROID;GLES;STBSHARP_INTERNAL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand Down
2 changes: 1 addition & 1 deletion Platforms/Kni.Platform.Android.GL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<LangVersion>Default</LangVersion>
<IsTrimmable>True</IsTrimmable>
<ProjectGuid>{CF09A088-6F64-4FA3-8FF8-E5B39F8BB0E6}</ProjectGuid>
<AssemblyName>Xna.Platform</AssemblyName>
<AssemblyName>Kni.Platform</AssemblyName>
<RootNamespace>Microsoft.Xna.Framework</RootNamespace>
<DefineConstants>ANDROID;OPENAL;OPENGL;GLES;STBSHARP_INTERNAL</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion Platforms/Kni.Platform.Blazor.GL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<TargetFrameworks>net8.0</TargetFrameworks>
<LangVersion>Default</LangVersion>
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">true</IsTrimmable>
<AssemblyName>Xna.Platform</AssemblyName>
<AssemblyName>Kni.Platform</AssemblyName>
<RootNamespace>Microsoft.Xna.Framework</RootNamespace>
<DefineConstants>$(DefineConstants);BLAZORGL;STBSHARP_INTERNAL</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion Platforms/Kni.Platform.Cardboard.GL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<LangVersion>Default</LangVersion>
<IsTrimmable>True</IsTrimmable>
<ProjectGuid>{BF257928-8B5D-4371-BD03-C18DA71918C3}</ProjectGuid>
<AssemblyName>Xna.Platform</AssemblyName>
<AssemblyName>Kni.Platform</AssemblyName>
<RootNamespace>Microsoft.Xna.Framework</RootNamespace>
<DefineConstants>ANDROID;CARDBOARD;OPENAL;OPENGL;GLES;STBSHARP_INTERNAL</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion Platforms/Kni.Platform.Ref.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
<LangVersion>7.3</LangVersion>
<AssemblyName>Xna.Platform</AssemblyName>
<AssemblyName>Kni.Platform</AssemblyName>
<RootNamespace>Microsoft.Xna.Framework</RootNamespace>
<DefineConstants>REF</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion Platforms/Kni.Platform.SDL2.GL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<OutputType>Library</OutputType>
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">true</IsTrimmable>
<RootNamespace>Microsoft.Xna.Framework</RootNamespace>
<AssemblyName>Xna.Platform</AssemblyName>
<AssemblyName>Kni.Platform</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>CS0067;CS1591;CS1574;CS0419;CS8500</NoWarn>
<AppendTargetFrameworkToOutputPath>True</AppendTargetFrameworkToOutputPath>
Expand Down
6 changes: 3 additions & 3 deletions Platforms/Kni.Platform.UAP.DX11.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.Xna.Framework</RootNamespace>
<AssemblyName>Xna.Platform</AssemblyName>
<AssemblyName>Kni.Platform</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>CS0067;CS1591;CS1574;CS0419;CS8500</NoWarn>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
Expand All @@ -27,7 +27,7 @@
<EnableUnmanagedDebugging>true</EnableUnmanagedDebugging>
<OutputPath>bin\WindowsUniversal\AnyCPU\Debug</OutputPath>
<IntermediateOutputPath>obj\WindowsUniversal\AnyCPU\Debug</IntermediateOutputPath>
<DocumentationFile>bin\WindowsUniversal\AnyCPU\Debug\Xna.Platform.xml</DocumentationFile>
<DocumentationFile>bin\WindowsUniversal\AnyCPU\Debug\Kni.Platform.xml</DocumentationFile>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;UAP;DIRECTX;DIRECTX11_1;WINDOWS_MEDIA_ENGINE;STBSHARP_INTERNAL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand All @@ -38,7 +38,7 @@
<DebugType>none</DebugType>
<OutputPath>bin\WindowsUniversal\AnyCPU\Release</OutputPath>
<IntermediateOutputPath>obj\WindowsUniversal\AnyCPU\Release</IntermediateOutputPath>
<DocumentationFile>bin\WindowsUniversal\AnyCPU\Release\Xna.Platform.xml</DocumentationFile>
<DocumentationFile>bin\WindowsUniversal\AnyCPU\Release\Kni.Platform.xml</DocumentationFile>
<DefineConstants>TRACE;NETFX_CORE;UAP;DIRECTX;DIRECTX11_1;WINDOWS_MEDIA_ENGINE;STBSHARP_INTERNAL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand Down
2 changes: 1 addition & 1 deletion Platforms/Kni.Platform.WinForms.DX11.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ProjectGuid>{7DE47032-A904-4C29-BD22-2D235E8D91BA}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.Xna.Framework</RootNamespace>
<AssemblyName>Xna.Platform</AssemblyName>
<AssemblyName>Kni.Platform</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>CS0067;CS1591;CS1574;CS0419;CS8500</NoWarn>
<AppendTargetFrameworkToOutputPath>True</AppendTargetFrameworkToOutputPath>
Expand Down
2 changes: 1 addition & 1 deletion Platforms/Kni.Platform.iOS.GL.Xamarin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<TargetFramework>xamarinios10</TargetFramework>
<SupportedOSPlatformVersion>11.2</SupportedOSPlatformVersion>
<LangVersion>Default</LangVersion>
<AssemblyName>Xna.Platform</AssemblyName>
<AssemblyName>Kni.Platform</AssemblyName>
<RootNamespace>Microsoft.Xna.Framework</RootNamespace>
<DefineConstants>IOS;GLES;OPENGL;OPENAL;STBSHARP_INTERNAL;XAMARINIOS</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion Platforms/Kni.Platform.iOS.GL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<LangVersion>Default</LangVersion>
<IsTrimmable>True</IsTrimmable>
<ProjectGuid>{D93291EF-3419-412E-BC56-376BD6A02224}</ProjectGuid>
<AssemblyName>Xna.Platform</AssemblyName>
<AssemblyName>Kni.Platform</AssemblyName>
<RootNamespace>Microsoft.Xna.Framework</RootNamespace>
<DefineConstants>IOS;OPENAL;OPENGL;GLES;STBSHARP_INTERNAL</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion Platforms/MonoGame.Framework.DesktopGL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>7.3</LangVersion>
<AssemblyName>Xna.Platform</AssemblyName>
<AssemblyName>Kni.Platform</AssemblyName>
<RootNamespace>Microsoft.Xna.Framework</RootNamespace>
<DefineConstants>LINUX;DESKTOPGL;OPENAL;OPENGL;SUPPORTS_EFX;NETSTANDARD;STBSHARP_INTERNAL</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion src/Xna.Framework.Audio/Audio/AudioFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private static AudioFactory CreateAudioFactory()
{
Console.WriteLine("Registering Concrete AudioFactoryStrategy through reflection.");

Type type = Type.GetType("Microsoft.Xna.Platform.Audio.ConcreteAudioFactory, Xna.Platform", false);
Type type = Type.GetType("Microsoft.Xna.Platform.Audio.ConcreteAudioFactory, Kni.Platform", false);
if (type != null)
if (type.IsSubclassOf(typeof(AudioFactory)) && !type.IsAbstract)
return (AudioFactory)Activator.CreateInstance(type);
Expand Down
2 changes: 1 addition & 1 deletion src/Xna.Framework.Content/TitleContainerFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private static TitleContainerFactory CreateTitleContainerFactory()
{
Console.WriteLine("Registering Concrete TitleContainerFactoryStrategy through reflection.");

Type type = Type.GetType("Microsoft.Xna.Platform.ConcreteTitleContainerFactory, Xna.Platform", false);
Type type = Type.GetType("Microsoft.Xna.Platform.ConcreteTitleContainerFactory, Kni.Platform", false);
if (type != null)
if (type.IsSubclassOf(typeof(TitleContainerFactory)) && !type.IsAbstract)
return (TitleContainerFactory)Activator.CreateInstance(type);
Expand Down
2 changes: 1 addition & 1 deletion src/Xna.Framework.Devices/Devices/DevicesFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ private static DevicesFactory CreateDevicesFactory()
{
Console.WriteLine("Registering ConcreteDevicesFactoryStrategy through reflection.");

Type type = Type.GetType("Microsoft.Xna.Platform.Devices.ConcreteDevicesFactory, Xna.Platform", false);
Type type = Type.GetType("Microsoft.Xna.Platform.Devices.ConcreteDevicesFactory, Kni.Platform", false);
if (type != null)
if (type.IsSubclassOf(typeof(DevicesFactory)) && !type.IsAbstract)
return (DevicesFactory)Activator.CreateInstance(type);
Expand Down
2 changes: 1 addition & 1 deletion src/Xna.Framework.Game/GameFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private static GameFactory CreateGameFactory()
{
Console.WriteLine("Registering ConcreteGameFactoryStrategy through reflection.");

Type type = Type.GetType("Microsoft.Xna.Platform.ConcreteGameFactory, Xna.Platform", false);
Type type = Type.GetType("Microsoft.Xna.Platform.ConcreteGameFactory, Kni.Platform", false);
if (type != null)
if (type.IsSubclassOf(typeof(GameFactory)) && !type.IsAbstract)
return (GameFactory)Activator.CreateInstance(type);
Expand Down
2 changes: 1 addition & 1 deletion src/Xna.Framework.Graphics/Graphics/GraphicsFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private static GraphicsFactory CreateGraphicsFactory()
{
Console.WriteLine("Registering Concrete GraphicsFactoryStrategy through reflection.");

Type type = Type.GetType("Microsoft.Xna.Platform.Graphics.ConcreteGraphicsFactory, Xna.Platform", false);
Type type = Type.GetType("Microsoft.Xna.Platform.Graphics.ConcreteGraphicsFactory, Kni.Platform", false);
if (type != null)
if (type.IsSubclassOf(typeof(GraphicsFactory)) && !type.IsAbstract)
return (GraphicsFactory)Activator.CreateInstance(type);
Expand Down
2 changes: 1 addition & 1 deletion src/Xna.Framework.Input/Input/InputFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ private static InputFactory CreateInputFactory()
{
Console.WriteLine("Registering ConcreteInputFactoryStrategy through reflection.");

Type type = Type.GetType("Microsoft.Xna.Platform.Input.ConcreteInputFactory, Xna.Platform", false);
Type type = Type.GetType("Microsoft.Xna.Platform.Input.ConcreteInputFactory, Kni.Platform", false);
if (type != null)
if (type.IsSubclassOf(typeof(InputFactory)) && !type.IsAbstract)
return (InputFactory)Activator.CreateInstance(type);
Expand Down
2 changes: 1 addition & 1 deletion src/Xna.Framework.Media/Media/MediaFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ private static MediaFactory CreateMediaFactory()
{
Console.WriteLine("Registering Concrete MediaFactoryStrategy through reflection.");

Type type = Type.GetType("Microsoft.Xna.Platform.Media.ConcreteMediaFactory, Xna.Platform", false);
Type type = Type.GetType("Microsoft.Xna.Platform.Media.ConcreteMediaFactory, Kni.Platform", false);
if (type != null)
if (type.IsSubclassOf(typeof(MediaFactory)) && !type.IsAbstract)
return (MediaFactory)Activator.CreateInstance(type);
Expand Down
2 changes: 1 addition & 1 deletion src/Xna.Framework.Storage/Storage/StorageFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ private static StorageFactory CreateStorageFactory()
{
Console.WriteLine("Registering ConcreteStorageFactoryStrategy through reflection.");

Type type = Type.GetType("Microsoft.Xna.Platform.Storage.ConcreteStorageFactory, Xna.Platform", false);
Type type = Type.GetType("Microsoft.Xna.Platform.Storage.ConcreteStorageFactory, Kni.Platform", false);
if (type != null)
if (type.IsSubclassOf(typeof(StorageFactory)) && !type.IsAbstract)
return (StorageFactory)Activator.CreateInstance(type);
Expand Down
2 changes: 1 addition & 1 deletion src/Xna.Framework.XR/XR/XRFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ private static XRFactory CreateXRFactory()
{
Console.WriteLine("Registering ConcreteXRFactoryStrategy through reflection.");

Type type = Type.GetType("Microsoft.Xna.Platform.XR.ConcreteXRFactory, Xna.Platform", false);
Type type = Type.GetType("Microsoft.Xna.Platform.XR.ConcreteXRFactory, Kni.Platform", false);
if (type != null)
if (type.IsSubclassOf(typeof(XRFactory)) && !type.IsAbstract)
return (XRFactory)Activator.CreateInstance(type);
Expand Down

0 comments on commit 2b772cc

Please sign in to comment.