Skip to content

Commit 96e8336

Browse files
jlee671jlee671
authored
Enable source link and bump compiler and language standard versions (#32)
* enable source link and bump versions * Bump the vm image to 2022 from 2019
1 parent 104752e commit 96e8336

File tree

6 files changed

+22
-6
lines changed

6 files changed

+22
-6
lines changed

Diff for: ‎azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pr:
1414
- README.md
1515

1616
pool:
17-
vmImage: windows-2019
17+
vmImage: windows-2022
1818

1919
variables:
2020
BuildConfiguration: Release

Diff for: ‎src/VSIXBootstrapper.Shared/VSIXBootstrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#pragma once
77

8-
using std::experimental::filesystem::v1::path;
8+
using std::filesystem::path;
99

1010
// Same generic error code VSIXInstaller.exe returns.
1111
#define GENERIC_ERROR 3001

Diff for: ‎src/VSIXBootstrapper/VSIXBootstrapper.vcxproj

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.1.0.0\build\Microsoft.VisualStudioEng.MicroBuild.Core.props" Condition="Exists('..\..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.1.0.0\build\Microsoft.VisualStudioEng.MicroBuild.Core.props')" />
4+
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.props')" />
5+
<Import Project="..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.props')" />
6+
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.props')" />
47
<ItemGroup Label="ProjectConfigurations">
58
<ProjectConfiguration Include="Debug|Win32">
69
<Configuration>Debug</Configuration>
@@ -24,13 +27,13 @@
2427
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2528
<ConfigurationType>Application</ConfigurationType>
2629
<UseDebugLibraries>true</UseDebugLibraries>
27-
<PlatformToolset>v141</PlatformToolset>
30+
<PlatformToolset>v143</PlatformToolset>
2831
<CharacterSet>Unicode</CharacterSet>
2932
</PropertyGroup>
3033
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3134
<ConfigurationType>Application</ConfigurationType>
3235
<UseDebugLibraries>false</UseDebugLibraries>
33-
<PlatformToolset>v141</PlatformToolset>
36+
<PlatformToolset>v143</PlatformToolset>
3437
<WholeProgramOptimization>true</WholeProgramOptimization>
3538
<CharacterSet>Unicode</CharacterSet>
3639
</PropertyGroup>
@@ -62,6 +65,7 @@
6265
<Optimization>Disabled</Optimization>
6366
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6467
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
68+
<LanguageStandard>stdcpp17</LanguageStandard>
6569
</ClCompile>
6670
<Link>
6771
<SubSystem>Windows</SubSystem>
@@ -79,6 +83,7 @@
7983
<IntrinsicFunctions>true</IntrinsicFunctions>
8084
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8185
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
86+
<LanguageStandard>stdcpp17</LanguageStandard>
8287
</ClCompile>
8388
<Link>
8489
<SubSystem>Windows</SubSystem>
@@ -121,6 +126,9 @@
121126
<Import Project="..\..\packages\Nerdbank.GitVersioning.3.6.133\build\NerdBank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.6.133\build\NerdBank.GitVersioning.targets')" />
122127
<Import Project="..\..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.1.0.0\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudioEng.MicroBuild.Core.1.0.0\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets')" />
123128
<Import Project="..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.3.8.2112\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.3.8.2112\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" />
129+
<Import Project="..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
130+
<Import Project="..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.targets')" />
131+
<Import Project="..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
124132
</ImportGroup>
125133
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
126134
<PropertyGroup>

Diff for: ‎src/VSIXBootstrapper/packages.config

+3
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
<package id="Microsoft.VisualStudioEng.MicroBuild.Core" version="1.0.0" targetFramework="native" developmentDependency="true" />
44
<package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="3.8.2112" targetFramework="native" developmentDependency="true" />
55
<package id="Nerdbank.GitVersioning" version="3.6.133" targetFramework="native" developmentDependency="true" />
6+
<package id="Microsoft.Build.Tasks.Git" version="8.0.0" targetFramework="native" developmentDependency="true" />
7+
<package id="Microsoft.SourceLink.Common" version="8.0.0" targetFramework="native" developmentDependency="true" />
8+
<package id="Microsoft.SourceLink.GitHub" version="8.0.0" targetFramework="native" developmentDependency="true" />
69
</packages>

Diff for: ‎test/VSIXBootstrapper.Test/VSIXBootstrapper.Test.vcxproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2525
<ConfigurationType>DynamicLibrary</ConfigurationType>
2626
<UseDebugLibraries>true</UseDebugLibraries>
27-
<PlatformToolset>v141</PlatformToolset>
27+
<PlatformToolset>v143</PlatformToolset>
2828
<CharacterSet>Unicode</CharacterSet>
2929
<UseOfMfc>false</UseOfMfc>
3030
</PropertyGroup>
3131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3232
<ConfigurationType>DynamicLibrary</ConfigurationType>
3333
<UseDebugLibraries>false</UseDebugLibraries>
34-
<PlatformToolset>v141</PlatformToolset>
34+
<PlatformToolset>v143</PlatformToolset>
3535
<WholeProgramOptimization>true</WholeProgramOptimization>
3636
<CharacterSet>Unicode</CharacterSet>
3737
<UseOfMfc>false</UseOfMfc>
@@ -67,6 +67,7 @@
6767
<AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6868
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6969
<UseFullPaths>true</UseFullPaths>
70+
<LanguageStandard>stdcpp17</LanguageStandard>
7071
</ClCompile>
7172
<Link>
7273
<SubSystem>Windows</SubSystem>
@@ -84,6 +85,7 @@
8485
<IntrinsicFunctions>true</IntrinsicFunctions>
8586
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8687
<UseFullPaths>true</UseFullPaths>
88+
<LanguageStandard>stdcpp17</LanguageStandard>
8789
</ClCompile>
8890
<Link>
8991
<SubSystem>Windows</SubSystem>

Diff for: ‎test/VSIXBootstrapper.Test/packages.config

+3
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
<package id="MicroBuild.Core" version="0.2.0" targetFramework="native" developmentDependency="true" />
44
<package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="1.8.24" targetFramework="native" developmentDependency="true" />
55
<package id="Nerdbank.GitVersioning" version="1.5.62" targetFramework="native" developmentDependency="true" />
6+
<package id="Microsoft.Build.Tasks.Git" version="8.0.0" targetFramework="native" developmentDependency="true" />
7+
<package id="Microsoft.SourceLink.Common" version="8.0.0" targetFramework="native" developmentDependency="true" />
8+
<package id="Microsoft.SourceLink.GitHub" version="8.0.0" targetFramework="native" developmentDependency="true" />
69
</packages>

0 commit comments

Comments
 (0)