Skip to content

Commit 3cba36d

Browse files
WardenGnawWardenGnaw
authored
Update Package Version for Component Governance (#1462)
* Update Package Version for Component Governance This PR updates to 17.11 packages and hardcodes System.Text.Json and Microsoft.IO.Redist for CG.
1 parent deee94d commit 3cba36d

5 files changed

Lines changed: 32 additions & 7 deletions

File tree

‎build/package_versions.settings.targets‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<Microsoft_VisualStudio_Debugger_Interop_Portable_Version>1.0.1</Microsoft_VisualStudio_Debugger_Interop_Portable_Version>
4-
<Microsoft_VisualStudio_Interop_Version>17.8.37221</Microsoft_VisualStudio_Interop_Version>
4+
<Microsoft_VisualStudio_Interop_Version>17.11.40262</Microsoft_VisualStudio_Interop_Version>
55
<Newtonsoft_Json_Version>13.0.3</Newtonsoft_Json_Version>
66
<Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>17.2.60629.1</Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>
77

@@ -25,15 +25,19 @@
2525
<Microsoft_VisualStudio_Debugger_Interop_15_0_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_Interop_15_0_Version>
2626
<Microsoft_VisualStudio_Debugger_Interop_16_0_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_Interop_16_0_Version>
2727
<Microsoft_VisualStudio_Debugger_InteropA_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_InteropA_Version>
28-
<Microsoft_VisualStudio_Shell_15_0_Version>17.8.37221</Microsoft_VisualStudio_Shell_15_0_Version>
29-
<Microsoft_VisualStudio_Shell_Framework_Version>17.8.37221</Microsoft_VisualStudio_Shell_Framework_Version>
30-
<Microsoft_VisualStudio_Threading_Version>17.8.14</Microsoft_VisualStudio_Threading_Version>
31-
<Microsoft_VisualStudio_Utilities_Version>17.8.37221</Microsoft_VisualStudio_Utilities_Version>
28+
<Microsoft_VisualStudio_Shell_15_0_Version>17.11.40262</Microsoft_VisualStudio_Shell_15_0_Version>
29+
<Microsoft_VisualStudio_Shell_Framework_Version>17.11.40262</Microsoft_VisualStudio_Shell_Framework_Version>
30+
<Microsoft_VisualStudio_Threading_Version>17.11.20</Microsoft_VisualStudio_Threading_Version>
31+
<Microsoft_VisualStudio_Utilities_Version>17.11.40262</Microsoft_VisualStudio_Utilities_Version>
3232
<Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>15.0.26932</Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>
3333
<Microsoft_VisualStudio_Workspace_Version>15.0.392</Microsoft_VisualStudio_Workspace_Version>
3434
<Microsoft_VisualStudio_Workspace_VSIntegration_Version>15.0.392</Microsoft_VisualStudio_Workspace_VSIntegration_Version>
35-
<Microsoft_VisualStudio_TextManager_Interop_Version>17.8.37221</Microsoft_VisualStudio_TextManager_Interop_Version>
35+
<Microsoft_VisualStudio_TextManager_Interop_Version>17.11.40262</Microsoft_VisualStudio_TextManager_Interop_Version>
3636
<Microsoft_VSSDK_BuildTools_Version>17.3.2093</Microsoft_VSSDK_BuildTools_Version>
3737
<System_Runtime_Loader_Version>4.3.0</System_Runtime_Loader_Version>
38+
39+
<!-- For Component Governance -->
40+
<Microsoft_IO_Redist_Version>6.0.1</Microsoft_IO_Redist_Version>
41+
<System_Text_Json_Version>8.0.4</System_Text_Json_Version>
3842
</PropertyGroup>
3943
</Project>

‎build/version.settings.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--SxS: These three properties should be changed at the start of a new version, VersionZeroYear should be the year
44
before the start of the project.-->
55
<MajorVersion>17</MajorVersion>
6-
<MinorVersion>8</MinorVersion>
6+
<MinorVersion>12</MinorVersion>
77
<VersionZeroYear>2022</VersionZeroYear>
88
<!-- Note: for compatibility, we leave the default assembly version of the repo at 14.0.
99
If we ever decide to change this, make sure that you notify partner teams such as C++ IOT -->

‎src/DebugEngineHost/DebugEngineHost.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@
8888
<IncludeAssets>compile</IncludeAssets>
8989
<PrivateAssets>all</PrivateAssets>
9090
</PackageReference>
91+
92+
<PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)">
93+
<ExcludeAssets>all</ExcludeAssets>
94+
</PackageReference>
95+
<PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)">
96+
<ExcludeAssets>all</ExcludeAssets>
97+
</PackageReference>
9198
</ItemGroup>
9299

93100
<ItemGroup Label="Assembly to Generate">

‎src/MIDebugPackage/MIDebugPackage.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@
5353
</PackageReference>
5454
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="$(Microsoft_VSSDK_BuildTools_Version)" GeneratePathProperty="true" />
5555
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true" />
56+
57+
<PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)">
58+
<ExcludeAssets>all</ExcludeAssets>
59+
</PackageReference>
60+
<PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)">
61+
<ExcludeAssets>all</ExcludeAssets>
62+
</PackageReference>
5663
</ItemGroup>
5764

5865
<ItemGroup>

‎src/SSHDebugPS/SSHDebugPS.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@
2828
</PackageReference>
2929

3030
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true" />
31+
32+
<PackageReference Include="Microsoft.IO.Redist" Version="$(Microsoft_IO_Redist_Version)">
33+
<ExcludeAssets>all</ExcludeAssets>
34+
</PackageReference>
35+
<PackageReference Include="System.Text.Json" Version="$(System_Text_Json_Version)">
36+
<ExcludeAssets>all</ExcludeAssets>
37+
</PackageReference>
3138
</ItemGroup>
3239

3340
<ItemGroup>

0 commit comments

Comments
 (0)