A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Removed ARM64 configuration (#2)
Etienne Baudoux05d610bc9d07
diff --git a/ci/azure-pipelines-release.yml b/ci/azure-pipelines-release.ymlindex 15799c300..b1314dff8 100644--- a/ci/azure-pipelines-release.yml+++ b/ci/azure-pipelines-release.yml@@ -12,7 +12,7 @@ pool:variables:group: BuildPipelineVariablesuwpProject: '**/*.wapproj'- buildPlatform: 'x86|x64|ARM|ARM64'+ buildPlatform: 'x86|x64|ARM'buildConfiguration: 'Release'appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\'certificateSecureFilePath: 'DevToys.Startup_TemporaryKey.pfx'diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.ymlindex 45a43ad37..cc639060f 100644--- a/ci/azure-pipelines.yml+++ b/ci/azure-pipelines.yml@@ -12,7 +12,7 @@ pool:variables:group: BuildPipelineVariablesuwpProject: '**/*.wapproj'- buildPlatform: 'x86|x64|ARM|ARM64'+ buildPlatform: 'x86|x64|ARM'buildConfiguration: 'Release'appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\'diff --git a/src/DevToys.sln b/src/DevToys.slnindex 7452541d2..4c72f757f 100644--- a/src/DevToys.sln+++ b/src/DevToys.sln@@ -39,11 +39,9 @@ EndProjectGlobalGlobalSection(SolutionConfigurationPlatforms) = preSolutionDebug|ARM = Debug|ARM- Debug|ARM64 = Debug|ARM64Debug|x64 = Debug|x64Debug|x86 = Debug|x86Release|ARM = Release|ARM- Release|ARM64 = Release|ARM64Release|x64 = Release|x64Release|x86 = Release|x86EndGlobalSection@@ -51,9 +49,6 @@ Global{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM.ActiveCfg = Debug|ARM{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM.Build.0 = Debug|ARM{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM.Deploy.0 = Debug|ARM- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM64.ActiveCfg = Debug|ARM64- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM64.Build.0 = Debug|ARM64- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|ARM64.Deploy.0 = Debug|ARM64{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x64.ActiveCfg = Debug|x64{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x64.Build.0 = Debug|x64{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Debug|x64.Deploy.0 = Debug|x64@@ -63,9 +58,6 @@ Global{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM.ActiveCfg = Release|ARM{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM.Build.0 = Release|ARM{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM.Deploy.0 = Release|ARM- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM64.ActiveCfg = Release|ARM64- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM64.Build.0 = Release|ARM64- {361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|ARM64.Deploy.0 = Release|ARM64{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x64.ActiveCfg = Release|x64{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x64.Build.0 = Release|x64{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x64.Deploy.0 = Release|x64@@ -74,16 +66,12 @@ Global{361DB7BC-BE7B-41A2-A29A-978A9E3B4AA7}.Release|x86.Deploy.0 = Release|x86{E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM.ActiveCfg = Debug|ARM{E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM.Build.0 = Debug|ARM- {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM64.ActiveCfg = Debug|ARM64- {E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|ARM64.Build.0 = Debug|ARM64{E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x64.ActiveCfg = Debug|x64{E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x64.Build.0 = Debug|x64{E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x86.ActiveCfg = Debug|x86{E3E4E200-B380-4207-9A7E-4C9421904502}.Debug|x86.Build.0 = Debug|x86{E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM.ActiveCfg = Release|ARM{E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM.Build.0 = Release|ARM- {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM64.ActiveCfg = Release|ARM64- {E3E4E200-B380-4207-9A7E-4C9421904502}.Release|ARM64.Build.0 = Release|ARM64{E3E4E200-B380-4207-9A7E-4C9421904502}.Release|x64.ActiveCfg = Release|x64{E3E4E200-B380-4207-9A7E-4C9421904502}.Release|x64.Build.0 = Release|x64{E3E4E200-B380-4207-9A7E-4C9421904502}.Release|x86.ActiveCfg = Release|x86@@ -91,9 +79,6 @@ Global{E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM.ActiveCfg = Debug|ARM{E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM.Build.0 = Debug|ARM{E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM.Deploy.0 = Debug|ARM- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM64.ActiveCfg = Debug|ARM64- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM64.Build.0 = Debug|ARM64- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|ARM64.Deploy.0 = Debug|ARM64{E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x64.ActiveCfg = Debug|x64{E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x64.Build.0 = Debug|x64{E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Debug|x64.Deploy.0 = Debug|x64@@ -103,9 +88,6 @@ Global{E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM.ActiveCfg = Release|ARM{E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM.Build.0 = Release|ARM{E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM.Deploy.0 = Release|ARM- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM64.ActiveCfg = Release|ARM64- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM64.Build.0 = Release|ARM64- {E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|ARM64.Deploy.0 = Release|ARM64{E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x64.ActiveCfg = Release|x64{E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x64.Build.0 = Release|x64{E1C4AB49-CFFF-420E-A182-E3028BD0493C}.Release|x64.Deploy.0 = Release|x64diff --git a/src/dev/DevToys.Startup/DevToys.Startup.wapproj b/src/dev/DevToys.Startup/DevToys.Startup.wapprojindex 1e2e38c74..52fc56c55 100644--- a/src/dev/DevToys.Startup/DevToys.Startup.wapproj+++ b/src/dev/DevToys.Startup/DevToys.Startup.wapproj@@ -25,14 +25,6 @@<Configuration>Release</Configuration><Platform>ARM</Platform></ProjectConfiguration>- <ProjectConfiguration Include="Debug|ARM64">- <Configuration>Debug</Configuration>- <Platform>ARM64</Platform>- </ProjectConfiguration>- <ProjectConfiguration Include="Release|ARM64">- <Configuration>Release</Configuration>- <Platform>ARM64</Platform>- </ProjectConfiguration></ItemGroup><PropertyGroup><WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>@@ -48,7 +40,7 @@<AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled><DisableXbfLineInfo>False</DisableXbfLineInfo><GenerateTestArtifacts>True</GenerateTestArtifacts>- <AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>+ <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms><HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks><AppxPackageDir>..\..\..\bin\AppPackages\</AppxPackageDir><AppxBundle>Always</AppxBundle>diff --git a/src/dev/impl/Directory.Build.props b/src/dev/impl/Directory.Build.propsindex 12efa6eb0..fc285ff04 100644--- a/src/dev/impl/Directory.Build.props+++ b/src/dev/impl/Directory.Build.props@@ -47,11 +47,7 @@<PlatformTarget>ARM</PlatformTarget></PropertyGroup>- <PropertyGroup Condition="'$(Platform)' == 'ARM64'">- <PlatformTarget>ARM64</PlatformTarget>- </PropertyGroup>-- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM' or '$(Configuration)|$(Platform)' == 'Release|ARM64'">+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'"><DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;ARM</DefineConstants></PropertyGroup>diff --git a/src/tests/DevToys.Tests/DevToys.Tests.csproj b/src/tests/DevToys.Tests/DevToys.Tests.csprojindex cff4c78f3..3f707d2a2 100644--- a/src/tests/DevToys.Tests/DevToys.Tests.csproj+++ b/src/tests/DevToys.Tests/DevToys.Tests.csproj@@ -45,10 +45,6 @@<PlatformTarget>ARM</PlatformTarget></PropertyGroup>- <PropertyGroup Condition="'$(Platform)' == 'ARM64'">- <PlatformTarget>ARM64</PlatformTarget>- </PropertyGroup>-<ItemGroup><SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" /></ItemGroup>diff --git a/tools/Restore-NuGetPackages.ps1 b/tools/Restore-NuGetPackages.ps1index 517384b62..3faa0a432 100644--- a/tools/Restore-NuGetPackages.ps1+++ b/tools/Restore-NuGetPackages.ps1@@ -29,11 +29,9 @@ if ($Path.EndsWith('.sln')) {Invoke-Expression '& "$MSBuildPath" $Path /t:restore /p:Configuration=Release /p:platform=x86 /v:$Verbosity'Invoke-Expression '& "$MSBuildPath" $Path /t:restore /p:Configuration=Release /p:platform=x64 /v:$Verbosity'Invoke-Expression '& "$MSBuildPath" $Path /t:restore /p:Configuration=Release /p:platform=arm /v:$Verbosity'- Invoke-Expression '& "$MSBuildPath" $Path /t:restore /p:Configuration=Release /p:platform=arm64 /v:$Verbosity'Invoke-Expression '& "$MSBuildPath" $Path /t:restore /p:Configuration=Debug /p:platform=x86 /v:$Verbosity'Invoke-Expression '& "$MSBuildPath" $Path /t:restore /p:Configuration=Debug /p:platform=x64 /v:$Verbosity'Invoke-Expression '& "$MSBuildPath" $Path /t:restore /p:Configuration=Debug /p:platform=arm /v:$Verbosity'- Invoke-Expression '& "$MSBuildPath" $Path /t:restore /p:Configuration=Debug /p:platform=arm64 /v:$Verbosity'if ($lastexitcode -ne 0) { throw }$slnDir = Split-Path -Path $Path -Parent