From 7f6e1656b0606013906b2a789d7c33859d0988f5 Mon Sep 17 00:00:00 2001 From: jklawreszuk Date: Sat, 21 Jan 2023 00:38:18 +0100 Subject: [PATCH] Cleanup Windows Phone refs --- build/Stride.build | 5 - deps/freetype/build.bat | 4 - .../WindowsPhone/ARM/NativeLibrary.dll | 3 - .../WindowsPhone/x86/NativeLibrary.dll | 3 - sources/README.md | 2 +- .../Properties/AssemblyInfo.WinPhone.cs | 39 ---- .../Properties/WMAppManifest.xml | 38 --- .../MSBuild.Sdk.Extras/Inference.targets | 4 - .../MSBuild.Sdk.Extras/Platforms.targets | 2 +- .../Platforms/Windows.targets | 10 - .../Stride.UnitTests/Stride.UnitTests.ttproj | 6 +- .../DirectXTex_WindowsPhone81.vcxproj | 218 ------------------ .../DirectXTex_WindowsPhone81.vcxproj.filters | 161 ------------- 13 files changed, 3 insertions(+), 492 deletions(-) delete mode 100644 samples/Templates/VRSandbox/VRSandbox/NativeLibs/WindowsPhone/ARM/NativeLibrary.dll delete mode 100644 samples/Templates/VRSandbox/VRSandbox/NativeLibs/WindowsPhone/x86/NativeLibrary.dll delete mode 100644 sources/engine/Stride.Audio.Tests/Properties/AssemblyInfo.WinPhone.cs delete mode 100644 sources/engine/Stride.Audio.Tests/Properties/WMAppManifest.xml delete mode 100644 sources/tools/Stride.TextureConverter.Wrappers/DirectXTex/DirectXTex_WindowsPhone81.vcxproj delete mode 100644 sources/tools/Stride.TextureConverter.Wrappers/DirectXTex/DirectXTex_WindowsPhone81.vcxproj.filters diff --git a/build/Stride.build b/build/Stride.build index e5d430394..adbfa599b 100644 --- a/build/Stride.build +++ b/build/Stride.build @@ -199,11 +199,6 @@ Example of use: - - - - - diff --git a/deps/freetype/build.bat b/deps/freetype/build.bat index 9a23ff59f..3455ee439 100644 --- a/deps/freetype/build.bat +++ b/deps/freetype/build.bat @@ -4,8 +4,6 @@ msbuild ..\..\externals\freetype\builds\windows\vc2013\freetype.vcxproj /Propert msbuild ..\..\externals\freetype\builds\windows\vc2013\freetype.vcxproj /Property:Configuration=Release;StridePlatform=WindowsStore;Platform=x64 msbuild ..\..\externals\freetype\builds\windows\vc2013\freetype.vcxproj /Property:Configuration=Release;StridePlatform=WindowsStore;Platform=Win32 msbuild ..\..\externals\freetype\builds\windows\vc2013\freetype.vcxproj /Property:Configuration=Release;StridePlatform=WindowsStore;Platform=ARM -msbuild ..\..\externals\freetype\builds\windows\vc2013\freetype.vcxproj /Property:Configuration=Release;StridePlatform=WindowsPhone;Platform=Win32 -msbuild ..\..\externals\freetype\builds\windows\vc2013\freetype.vcxproj /Property:Configuration=Release;StridePlatform=WindowsPhone;Platform=ARM msbuild ..\..\externals\freetype\builds\windows\vc2013\freetype.vcxproj /Property:Configuration=Release;StridePlatform=Windows10;Platform=x64 msbuild ..\..\externals\freetype\builds\windows\vc2013\freetype.vcxproj /Property:Configuration=Release;StridePlatform=Windows10;Platform=Win32 msbuild ..\..\externals\freetype\builds\windows\vc2013\freetype.vcxproj /Property:Configuration=Release;StridePlatform=Windows10;Platform=ARM @@ -14,7 +12,5 @@ xcopy /Y /S ..\..\externals\freetype\builds\windows\vc2013\bin\Windows\Release\* xcopy /Y /S ..\..\externals\freetype\builds\windows\vc2013\bin\Windows\Release\*.pdb Windows\ xcopy /Y /S ..\..\externals\freetype\builds\windows\vc2013\bin\Windows10\Release\*.dll Windows10\ xcopy /Y /S ..\..\externals\freetype\builds\windows\vc2013\bin\Windows10\Release\*.pdb Windows10\ -xcopy /Y /S ..\..\externals\freetype\builds\windows\vc2013\bin\WindowsPhone\Release\*.dll WindowsPhone\ -xcopy /Y /S ..\..\externals\freetype\builds\windows\vc2013\bin\WindowsPhone\Release\*.pdb WindowsPhone\ xcopy /Y /S ..\..\externals\freetype\builds\windows\vc2013\bin\WindowsStore\Release\*.dll WindowsStore\ xcopy /Y /S ..\..\externals\freetype\builds\windows\vc2013\bin\WindowsStore\Release\*.pdb WindowsStore\ diff --git a/samples/Templates/VRSandbox/VRSandbox/NativeLibs/WindowsPhone/ARM/NativeLibrary.dll b/samples/Templates/VRSandbox/VRSandbox/NativeLibs/WindowsPhone/ARM/NativeLibrary.dll deleted file mode 100644 index f5bd8bea1..000000000 --- a/samples/Templates/VRSandbox/VRSandbox/NativeLibs/WindowsPhone/ARM/NativeLibrary.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0c8ab00992e17d2f2672e4dbe932caa7f78af49725fb164d432683ee0a9ac38 -size 39424 diff --git a/samples/Templates/VRSandbox/VRSandbox/NativeLibs/WindowsPhone/x86/NativeLibrary.dll b/samples/Templates/VRSandbox/VRSandbox/NativeLibs/WindowsPhone/x86/NativeLibrary.dll deleted file mode 100644 index fc1a689c7..000000000 --- a/samples/Templates/VRSandbox/VRSandbox/NativeLibs/WindowsPhone/x86/NativeLibrary.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0fca6f050da8c07de6021081064cbba0a5ca262fd26de0192c8a42b4478f7e04 -size 29696 diff --git a/sources/README.md b/sources/README.md index c9098e855..57a93ef13 100644 --- a/sources/README.md +++ b/sources/README.md @@ -41,7 +41,7 @@ and used by most projects. ### targets ### -* MSBuild target files to create easily cross-platform solutions (Android, iOS, WinRT, WinPhone, etc...), and define behaviors and targets globally. Extensible. +* MSBuild target files to create easily cross-platform solutions (Android, iOS, WinRT, etc...), and define behaviors and targets globally. Extensible. ---------- diff --git a/sources/engine/Stride.Audio.Tests/Properties/AssemblyInfo.WinPhone.cs b/sources/engine/Stride.Audio.Tests/Properties/AssemblyInfo.WinPhone.cs deleted file mode 100644 index 85ad41ff4..000000000 --- a/sources/engine/Stride.Audio.Tests/Properties/AssemblyInfo.WinPhone.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp) -// Distributed under the MIT license. See the LICENSE.md file in the project root for more information. -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Resources; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Stride.Audio.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Stride.Audio.Tests")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("36bd5af4-f1c4-4d8a-b5b8-8224bc308491")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: NeutralResourcesLanguageAttribute("en-US")] diff --git a/sources/engine/Stride.Audio.Tests/Properties/WMAppManifest.xml b/sources/engine/Stride.Audio.Tests/Properties/WMAppManifest.xml deleted file mode 100644 index 4d9084ac5..000000000 --- a/sources/engine/Stride.Audio.Tests/Properties/WMAppManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - Assets\ApplicationIcon.png - - - - - - - - - - - - - - Assets\Tiles\FlipCycleTileSmall.png - 0 - Assets\Tiles\FlipCycleTileMedium.png - Stride.Audio.Tests - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sources/targets/MSBuild.Sdk.Extras/Inference.targets b/sources/targets/MSBuild.Sdk.Extras/Inference.targets index a8994b2cd..93213085c 100644 --- a/sources/targets/MSBuild.Sdk.Extras/Inference.targets +++ b/sources/targets/MSBuild.Sdk.Extras/Inference.targets @@ -12,9 +12,7 @@ net35-cf netmf44 net45 - wpa81 win8 - wp8 sl5 @@ -57,8 +55,6 @@ .NETMicroFramework Silverlight - WindowsPhone - WindowsPhoneApp .NETCore .NETCore .NETCore diff --git a/sources/targets/MSBuild.Sdk.Extras/Platforms.targets b/sources/targets/MSBuild.Sdk.Extras/Platforms.targets index ef991c1a6..cf7917c54 100644 --- a/sources/targets/MSBuild.Sdk.Extras/Platforms.targets +++ b/sources/targets/MSBuild.Sdk.Extras/Platforms.targets @@ -6,7 +6,7 @@ <_SdkPlatformName>$(TargetFrameworkIdentifier) - <_SdkPlatformName Condition="'$(TargetFrameworkIdentifier)' == '.NETCore' OR '$(TargetFrameworkIdentifier)' == 'WindowsPhoneApp'">Windows + <_SdkPlatformName Condition="'$(TargetFrameworkIdentifier)' == '.NETCore'">Windows <_SdkPlatformName Condition="'$(TargetFrameworkIdentifier)' == '.NETPortable'">Portable <_SdkPlatformName Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">NETFramework <_SdkPlatformName Condition="$(TargetFrameworkIdentifier.StartsWith('Xamarin'))">Xamarin diff --git a/sources/targets/MSBuild.Sdk.Extras/Platforms/Windows.targets b/sources/targets/MSBuild.Sdk.Extras/Platforms/Windows.targets index 771df112f..df2e090bf 100644 --- a/sources/targets/MSBuild.Sdk.Extras/Platforms/Windows.targets +++ b/sources/targets/MSBuild.Sdk.Extras/Platforms/Windows.targets @@ -32,16 +32,6 @@ WINDOWS8_1 - - 8.1 - 8.1 - v8.1 - WindowsPhoneApp - - - WINDOWS_PHONE_APP - - v6.0 UAP diff --git a/sources/tools/Stride.ProjectGenerator/Templates/Stride.UnitTests/Stride.UnitTests.ttproj b/sources/tools/Stride.ProjectGenerator/Templates/Stride.UnitTests/Stride.UnitTests.ttproj index dbe5fd1a8..177e85444 100644 --- a/sources/tools/Stride.ProjectGenerator/Templates/Stride.UnitTests/Stride.UnitTests.ttproj +++ b/sources/tools/Stride.ProjectGenerator/Templates/Stride.UnitTests/Stride.UnitTests.ttproj @@ -4,7 +4,6 @@ Files: - {Source: $ProjectName$.csproj.t4, Target: $ProjectName$.Linux.csproj, IsTemplate: true, CurrentPlatform: Linux} - {Source: $ProjectName$.csproj.t4, Target: $ProjectName$.macOS.csproj, IsTemplate: true, CurrentPlatform: macOS} - {Source: $ProjectName$.csproj.t4, Target: $ProjectName$.Windows.csproj, IsTemplate: true, CurrentPlatform: Windows} - - {Source: $ProjectName$.csproj.t4, Target: $ProjectName$.WindowsPhone.csproj, IsTemplate: true, CurrentPlatform: WindowsPhone} - {Source: $ProjectName$.csproj.t4, Target: $ProjectName$.WindowsStore.csproj, IsTemplate: true, CurrentPlatform: WindowsStore} - {Source: $ProjectName$.csproj.t4, Target: $ProjectName$.iOS.csproj, IsTemplate: true, CurrentPlatform: iOS} - {Source: $ProjectName$.csproj.t4, Target: $ProjectName$.Android.csproj, IsTemplate: true, CurrentPlatform: Android} @@ -18,9 +17,6 @@ Files: - {Source: MainPage.xaml.t4, Target: MainPage.xaml, IsTemplate: true} - {Source: App.xaml.cs.t4, Target: App.xaml.cs, IsTemplate: true} - {Source: App.xaml.t4, Target: App.xaml, IsTemplate: true} - - {Source: Resources\StrideIcon150x150.png, Target: Resources\WindowsPhone\Logo.png} - {Source: Resources\StrideIcon150x150.png, Target: Resources\WindowsStore\Logo.png} - {Source: Resources\StrideIcon54x54.png, Target: Resources\WindowsStore\SmallLogo.png} - - {Source: Resources\StrideIcon106x106.png, Target: Resources\WindowsPhone\SmallLogo.png} - - {Source: Resources\StrideSplashScreen480x800.png, Target: Resources\WindowsPhone\SplashScreen.png} - - {Source: Resources\StrideSplashScreen620x300.png, Target: Resources\WindowsStore\SplashScreen.png} + - {Source: Resources\StrideSplashScreen620x300.png, Target: Resources\WindowsStore\SplashScreen.png} \ No newline at end of file diff --git a/sources/tools/Stride.TextureConverter.Wrappers/DirectXTex/DirectXTex_WindowsPhone81.vcxproj b/sources/tools/Stride.TextureConverter.Wrappers/DirectXTex/DirectXTex_WindowsPhone81.vcxproj deleted file mode 100644 index 52776ce20..000000000 --- a/sources/tools/Stride.TextureConverter.Wrappers/DirectXTex/DirectXTex_WindowsPhone81.vcxproj +++ /dev/null @@ -1,218 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - ARM - - - Release - ARM - - - - {5709aa1f-d4e3-4138-bdd6-55c8daf3d983} - Win32Proj - DirectXTex - DirectXTex - en-US - 12.0 - true - Windows Phone - 8.1 - - - - StaticLibrary - true - v120_wp81 - - - StaticLibrary - false - v120_wp81 - - - StaticLibrary - true - v120_wp81 - - - StaticLibrary - false - v120_wp81 - - - - - - - - - - - - - - - - - - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - DirectXTex - - - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - DirectXTex - - - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - DirectXTex - - - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - Bin\WindowsPhone81\$(Platform)\$(Configuration)\ - DirectXTex - - - - Use - false - true - DirectXTexP.h - $(IntDir)$(TargetName).pdb - Fast - StreamingSIMDExtensions2 - - - Console - false - false - - - - - Use - false - true - DirectXTexP.h - $(IntDir)$(TargetName).pdb - Fast - StreamingSIMDExtensions2 - - - Console - false - false - - - - - Use - false - true - DirectXTexP.h - $(IntDir)$(TargetName).pdb - Fast - - - Console - false - false - - - - - Use - false - true - DirectXTexP.h - $(IntDir)$(TargetName).pdb - Fast - - - Console - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - Document - - - Document - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sources/tools/Stride.TextureConverter.Wrappers/DirectXTex/DirectXTex_WindowsPhone81.vcxproj.filters b/sources/tools/Stride.TextureConverter.Wrappers/DirectXTex/DirectXTex_WindowsPhone81.vcxproj.filters deleted file mode 100644 index c232e025a..000000000 --- a/sources/tools/Stride.TextureConverter.Wrappers/DirectXTex/DirectXTex_WindowsPhone81.vcxproj.filters +++ /dev/null @@ -1,161 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - {ae44e5d8-5e05-47c8-92f5-0d6464fff56b} - - - {dc9e6b8b-d350-4f63-895f-790dbd53c33e} - - - {226c7e42-76b6-499d-a4f6-df6ca1643037} - - - {4e237727-0b49-48ae-aae4-2b525ec1e124} - - - {67066457-5e0a-49d3-893a-0ae08a4c0ed5} - - - - - Source Files\Shaders - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders\Compiled - - - Source Files\Shaders - - - Source Files\Shaders - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - Source Files\Shaders\Symbols - - - \ No newline at end of file