diff --git a/ImageSharp/ImageSharp.csproj b/ImageSharp/ImageSharp.csproj index 7a170b8..be58850 100644 --- a/ImageSharp/ImageSharp.csproj +++ b/ImageSharp/ImageSharp.csproj @@ -19,52 +19,6 @@ true false - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x86 - false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x86 - false - prompt - true - true - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - true bin\ARM64\Debug\ diff --git a/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj b/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj index 7ab1b65..6a9d934 100644 --- a/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj +++ b/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj @@ -12,7 +12,7 @@ en-US UAP 10.0.19041.0 - 10.0.17763.0 + 10.0.18362.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -23,55 +23,9 @@ True True Always - x86|x64|arm + x64|ARM64 0 - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x86 - false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x86 - false - prompt - true - true - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - true bin\ARM64\Debug\ @@ -277,16 +231,16 @@ 1.26.0 - 1.6.7 + 1.6.8 - 1.0.44 + 1.0.46 - 1.0.44 + 1.0.46 - 1.0.44 + 1.0.46 3.0.1 diff --git a/Yugen.Mosaic.sln b/Yugen.Mosaic.sln index adb28ef..37bbba9 100644 --- a/Yugen.Mosaic.sln +++ b/Yugen.Mosaic.sln @@ -7,47 +7,35 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yugen.Mosaic.Uwp", "Yugen.M EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Azure", "Azure", "{E44DE1EE-E0B3-4250-8CBE-F9B13C6DF19A}" ProjectSection(SolutionItems) = preProject - build-pipelines.yml = build-pipelines.yml + azure-pipelines.yml = azure-pipelines.yml GitVersion.yml = GitVersion.yml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{6140E03F-4808-489A-B10F-6B8D5B9D64F1}" + ProjectSection(SolutionItems) = preProject README.md = README.md EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9401F9CD-F858-451C-9022-A4C1663587BB}.Debug|ARM.ActiveCfg = Debug|ARM - {9401F9CD-F858-451C-9022-A4C1663587BB}.Debug|ARM.Build.0 = Debug|ARM - {9401F9CD-F858-451C-9022-A4C1663587BB}.Debug|ARM.Deploy.0 = Debug|ARM {9401F9CD-F858-451C-9022-A4C1663587BB}.Debug|ARM64.ActiveCfg = Debug|ARM64 {9401F9CD-F858-451C-9022-A4C1663587BB}.Debug|ARM64.Build.0 = Debug|ARM64 {9401F9CD-F858-451C-9022-A4C1663587BB}.Debug|ARM64.Deploy.0 = Debug|ARM64 {9401F9CD-F858-451C-9022-A4C1663587BB}.Debug|x64.ActiveCfg = Debug|x64 {9401F9CD-F858-451C-9022-A4C1663587BB}.Debug|x64.Build.0 = Debug|x64 {9401F9CD-F858-451C-9022-A4C1663587BB}.Debug|x64.Deploy.0 = Debug|x64 - {9401F9CD-F858-451C-9022-A4C1663587BB}.Debug|x86.ActiveCfg = Debug|x86 - {9401F9CD-F858-451C-9022-A4C1663587BB}.Debug|x86.Build.0 = Debug|x86 - {9401F9CD-F858-451C-9022-A4C1663587BB}.Debug|x86.Deploy.0 = Debug|x86 - {9401F9CD-F858-451C-9022-A4C1663587BB}.Release|ARM.ActiveCfg = Release|ARM - {9401F9CD-F858-451C-9022-A4C1663587BB}.Release|ARM.Build.0 = Release|ARM - {9401F9CD-F858-451C-9022-A4C1663587BB}.Release|ARM.Deploy.0 = Release|ARM {9401F9CD-F858-451C-9022-A4C1663587BB}.Release|ARM64.ActiveCfg = Release|ARM64 {9401F9CD-F858-451C-9022-A4C1663587BB}.Release|ARM64.Build.0 = Release|ARM64 {9401F9CD-F858-451C-9022-A4C1663587BB}.Release|ARM64.Deploy.0 = Release|ARM64 {9401F9CD-F858-451C-9022-A4C1663587BB}.Release|x64.ActiveCfg = Release|x64 {9401F9CD-F858-451C-9022-A4C1663587BB}.Release|x64.Build.0 = Release|x64 {9401F9CD-F858-451C-9022-A4C1663587BB}.Release|x64.Deploy.0 = Release|x64 - {9401F9CD-F858-451C-9022-A4C1663587BB}.Release|x86.ActiveCfg = Release|x86 - {9401F9CD-F858-451C-9022-A4C1663587BB}.Release|x86.Build.0 = Release|x86 - {9401F9CD-F858-451C-9022-A4C1663587BB}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build-pipelines.yml b/azure-pipelines.yml similarity index 96% rename from build-pipelines.yml rename to azure-pipelines.yml index 64f8a03..c7b0f3e 100644 --- a/build-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ pool: variables: solution: '**/*.sln' - buildPlatform: 'x86|x64|ARM64' + buildPlatform: 'x64|ARM64' buildConfiguration: 'Release' appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\' appxmanifest: '**/*.appxmanifest' @@ -40,7 +40,7 @@ steps: - task: VSBuild@1 inputs: - platform: 'x86' + platform: 'x64' solution: '$(solution)' configuration: '$(buildConfiguration)' msbuildArgs: '/p:AppxBundlePlatforms="$(buildPlatform)"