Skip to content

Commit 3b92274

Browse files
committed
Updated to VS 2022.
1 parent ba2a05d commit 3b92274

File tree

6 files changed

+26
-22
lines changed

6 files changed

+26
-22
lines changed

ColorCode.UWP/ColorCode.UWP.csproj

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFramework>uap10.0.16299</TargetFramework>
4+
<TargetFramework>uap10.0.18362</TargetFramework>
55
<RootNamespace>ColorCode</RootNamespace>
66
<AssemblyName>ColorCode.UWP</AssemblyName>
77
<Title>ColorCode.UWP</Title>
88
<Description>Contains the RichTextBlockFormatter, for rendering the Colorized Code to a RichTextBlock.</Description>
99
<PackageTags>ColorCode Syntax Highlighting SyntaxHighlighting Formatting UWP RichTextBlock Document InlineCollection</PackageTags>
10-
</PropertyGroup>
11-
12-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
13-
<DebugType>full</DebugType>
14-
<DebugSymbols>true</DebugSymbols>
15-
</PropertyGroup>
16-
17-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18-
<DebugType>full</DebugType>
19-
<DebugSymbols>true</DebugSymbols>
10+
<DebugType>Portable</DebugType>
2011
</PropertyGroup>
2112

2213
<ItemGroup>

ColorCode.sln

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

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

Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
<!-- UWP Config -->
1717
<PropertyGroup Condition="'$(IsUwpProject)' == 'true'">
18-
<TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
19-
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
18+
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
19+
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
2020
</PropertyGroup>
2121

2222
<!-- WinUI Config -->
@@ -49,7 +49,7 @@
4949
<Choose>
5050
<When Condition="'$(IsUwpProject)' == 'true' and '$(IsTestProject)' != 'true'">
5151
<ItemGroup>
52-
<PackageReference Include="MSBuild.Sdk.Extras" Version="3.0.23" PrivateAssets="all" />
52+
<PackageReference Include="MSBuild.Sdk.Extras" Version="3.0.38" PrivateAssets="all" />
5353
</ItemGroup>
5454
</When>
5555
</Choose>

azure-pipelines.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ pr:
77
- rel/*
88

99
pool:
10-
vmImage: windows-2019
10+
vmImage: windows-2022
1111

1212
variables:
1313
BuildConfiguration: Release
1414

1515
steps:
1616
- task: BatchScript@1
1717
inputs:
18-
filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
18+
filename: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
1919
arguments: -no_logo
2020
modifyEnvironment: true
2121
displayName: Setup Environment Variables
@@ -38,9 +38,13 @@ steps:
3838
- task: UseDotNet@2
3939
displayName: 'Install .NET Core SDK'
4040
inputs:
41-
version: 5.0.402
41+
version: 5.0.403
4242
performMultiLevelLookup: true
4343

44+
# Workaround for VS2022 in CI Builds
45+
- bash: dotnet tool update -g dotnet-vs
46+
- 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
47+
4448
- task: DotNetCoreCLI@2
4549
inputs:
4650
command: custom
@@ -66,4 +70,11 @@ steps:
6670
inputs:
6771
pathToPublish: .\build\nupkg
6872
artifactType: container
69-
artifactName: Packages
73+
artifactName: Packages
74+
75+
- task: PublishPipelineArtifact@1
76+
displayName: Publish BinLog
77+
inputs:
78+
targetPath: .\build\msbuild.binlog
79+
artifactName: BinLog
80+
condition: always()

build/build.cake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#addin nuget:?package=Cake.FileHelpers&version=4.0.1
44
#addin nuget:?package=Cake.Powershell&version=1.0.1
5-
#addin nuget:?package=Cake.GitVersioning&version=3.4.216
5+
#addin nuget:?package=Cake.GitVersioning&version=3.4.244
66

77
#tool nuget:?package=vswhere&version=2.8.4
88

@@ -147,6 +147,7 @@ Task("Build")
147147
.SetConfiguration("Release")
148148
.WithTarget("Pack")
149149
.WithProperty("GenerateLibraryLayout", "true")
150+
.EnableBinaryLogger()
150151
.WithProperty("PackageOutputPath", nupkgDir);
151152

152153
UpdateToolsPath(buildSettings);

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"msbuild-sdks": {
3-
"MSBuild.Sdk.Extras": "3.0.23"
3+
"MSBuild.Sdk.Extras": "3.0.38"
44
}
55
}

0 commit comments

Comments
 (0)