Updated to VS 2022.

CommunityToolkit · Nov 17, 2021 · 3b92274 · 3b92274
1 parent ba2a05d
commit 3b92274
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 22 deletions.
diff --git a/ColorCode.UWP/ColorCode.UWP.csproj b/ColorCode.UWP/ColorCode.UWP.csproj
@@ -1,22 +1,13 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFramework>uap10.0.16299</TargetFramework>
+    <TargetFramework>uap10.0.18362</TargetFramework>
     <RootNamespace>ColorCode</RootNamespace>
     <AssemblyName>ColorCode.UWP</AssemblyName>
     <Title>ColorCode.UWP</Title>
     <Description>Contains the RichTextBlockFormatter, for rendering the Colorized Code to a RichTextBlock.</Description>
     <PackageTags>ColorCode Syntax Highlighting SyntaxHighlighting Formatting UWP RichTextBlock Document InlineCollection</PackageTags>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DebugType>full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DebugType>full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
+    <DebugType>Portable</DebugType>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/ColorCode.sln b/ColorCode.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30104.148
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31912.275
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorCode.HTML", "ColorCode.HTML\ColorCode.HTML.csproj", "{33A3FB96-F1EB-4AF0-94E0-F629E1F574A8}"
 EndProject
@@ -20,6 +20,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A4B1B99B-FC3A-4C76-8B46-B96723829FD2}"
 	ProjectSection(SolutionItems) = preProject
 		azure-pipelines.yml = azure-pipelines.yml
+		build\build.cake = build\build.cake
 		ColorCode.snk = ColorCode.snk
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -15,8 +15,8 @@
 
   <!-- UWP Config -->
   <PropertyGroup Condition="'$(IsUwpProject)' == 'true'">
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
   </PropertyGroup>
 
   <!-- WinUI Config -->
@@ -49,7 +49,7 @@
   <Choose>
     <When Condition="'$(IsUwpProject)' == 'true' and '$(IsTestProject)' != 'true'">
       <ItemGroup>
-        <PackageReference Include="MSBuild.Sdk.Extras" Version="3.0.23" PrivateAssets="all" />
+        <PackageReference Include="MSBuild.Sdk.Extras" Version="3.0.38" PrivateAssets="all" />
       </ItemGroup>
     </When>
   </Choose>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -7,15 +7,15 @@ pr:
 - rel/*
 
 pool:
-  vmImage: windows-2019
+  vmImage: windows-2022
 
 variables: 
   BuildConfiguration: Release
 
 steps:
 - task: BatchScript@1
   inputs:
-    filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
+    filename: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
     arguments: -no_logo
     modifyEnvironment: true
   displayName: Setup Environment Variables
@@ -38,9 +38,13 @@ steps:
 - task: UseDotNet@2
   displayName: 'Install .NET Core SDK'
   inputs:
-    version: 5.0.402
+    version: 5.0.403
     performMultiLevelLookup: true
 
+# Workaround for VS2022 in CI Builds
+- bash: dotnet tool update -g dotnet-vs
+- bash: vs modify --rel -sku:enterprise --quiet +Microsoft.Component.MSBuild +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools +Microsoft.VisualStudio.Workload.UniversalBuildTools +Microsoft.VisualStudio.ComponentGroup.UWP.BuildTools +Microsoft.VisualStudio.Workload.MSBuildTools +Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools +Microsoft.VisualStudio.Component.Windows10SDK +Microsoft.VisualStudio.Component.Windows10SDK.18362 +Microsoft.VisualStudio.Component.Windows10SDK.19041 +Microsoft.VisualStudio.Component.Windows10SDK.20348 +Microsoft.VisualStudio.Component.Windows10SDK.22000 +Microsoft.VisualStudio.Workload.Universal
+
 - task: DotNetCoreCLI@2
   inputs:
     command: custom
@@ -66,4 +70,11 @@ steps:
   inputs:
     pathToPublish: .\build\nupkg
     artifactType: container
-    artifactName: Packages
+    artifactName: Packages
+
+- task: PublishPipelineArtifact@1
+  displayName: Publish BinLog
+  inputs:
+    targetPath: .\build\msbuild.binlog
+    artifactName: BinLog
+  condition: always()
diff --git a/build/build.cake b/build/build.cake
@@ -2,7 +2,7 @@
 
 #addin nuget:?package=Cake.FileHelpers&version=4.0.1
 #addin nuget:?package=Cake.Powershell&version=1.0.1
-#addin nuget:?package=Cake.GitVersioning&version=3.4.216
+#addin nuget:?package=Cake.GitVersioning&version=3.4.244
 
 #tool nuget:?package=vswhere&version=2.8.4
 
@@ -147,6 +147,7 @@ Task("Build")
     .SetConfiguration("Release")
     .WithTarget("Pack")
     .WithProperty("GenerateLibraryLayout", "true")
+    .EnableBinaryLogger()
     .WithProperty("PackageOutputPath", nupkgDir);
 
     UpdateToolsPath(buildSettings);

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "3.0.23"
+    "MSBuild.Sdk.Extras": "3.0.38"
   }
 }