Skip to content

Commit 2d2b2f2

Browse files
JanProvaznikJanProvaznik
authored
Merge branch 'vs17.8' into vs17.8-arcade-update
2 parents 673cbbc + 4c8a0ca commit 2d2b2f2

6 files changed

+37
-25
lines changed

‎eng/Packages.props

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<PackageVersion Include="NuGet.Frameworks" Version="$(NuGetBuildTasksVersion)" />
2020
<PackageVersion Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
2121
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
22+
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
2223
<PackageVersion Include="System.Memory" Version="$(SystemMemoryVersion)" />
2324
<PackageVersion Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
2425
<PackageVersion Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />

‎eng/SourceBuildPrebuiltBaseline.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
<UsageData>
55
<IgnorePatterns>
66
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
7-
7+
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
8+
<UsagePattern IdentityGlob="System.Collections.Immutable/*8.0.0*" />
9+
810
<!-- Baseline 7.0 dependencies until msbuild targets net8 and uses a net8 arcade, SBRP, etc.
911
These cannot be added to 7.0 SBRP, because they would are produced in the 7.0 build. -->
1012
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*7.0.0*" />
1113
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
1214
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
1315
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
14-
<UsagePattern IdentityGlob="System.Text.Json/*7.0.3*" />
16+
<UsagePattern IdentityGlob="System.Text.Json/*8.0.4*" />
1517
</IgnorePatterns>
1618
<Usages>
1719
</Usages>

‎eng/Version.Details.xml

+10-6
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<!-- Necessary for source-build due to being a transitive dependency of System.Reflection.MetadataLoadContext.
1515
This allows the package to be retrieved from previously-source-built artifacts and flow in as dependencies
1616
of the packages produced by msbuild. -->
17-
<Dependency Name="System.Collections.Immutable" Version="7.0.0">
18-
<Uri>https://github.com/dotnet/runtime</Uri>
19-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
17+
<Dependency Name="System.Collections.Immutable" Version="8.0.0">
18+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
19+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
2020
</Dependency>
2121
<!-- Necessary for source-build. This allows the package to be retrieved from previously-source-built artifacts
2222
and flow in as dependencies of the packages produced by msbuild. -->
@@ -52,9 +52,13 @@
5252
<Uri>https://github.com/dotnet/runtime</Uri>
5353
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
5454
</Dependency>
55-
<Dependency Name="System.Text.Json" Version="7.0.3">
56-
<Uri>https://github.com/dotnet/runtime</Uri>
57-
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
55+
<Dependency Name="System.Text.Json" Version="8.0.4">
56+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
57+
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
58+
</Dependency>
59+
<Dependency Name="System.Formats.Asn1" Version="8.0.1">
60+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
61+
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
5862
</Dependency>
5963
</ProductDependencies>
6064
<ToolsetDependencies>

‎eng/Versions.props

+4-3
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@
2727
</PropertyGroup>
2828
<!-- Production Dependencies -->
2929
<PropertyGroup>
30-
<SystemCollectionsImmutableVersion>7.0.0</SystemCollectionsImmutableVersion>
30+
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
3131
<SystemConfigurationConfigurationManagerVersion>7.0.0</SystemConfigurationConfigurationManagerVersion>
32+
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
3233
<!--
3334
Modifying the version of System.Memory is very high impact and causes downstream breaks in third-party tooling that uses the MSBuild API.
3435
When updating the version of System.Memory file a breaking change here: https://github.com/dotnet/docs/issues/new?assignees=gewarren&labels=breaking-change%2CPri1%2Cdoc-idea&template=breaking-change.yml&title=%5BBreaking+change%5D%3A+
@@ -50,11 +51,11 @@
5051
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
5152
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24516.1</MicrosoftDotNetXUnitExtensionsVersion>
5253
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
53-
<MicrosoftIORedistVersion>6.0.0</MicrosoftIORedistVersion>
54+
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
5455
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23465.5</MicrosoftNetCompilersToolsetVersion>
5556
<NuGetBuildTasksVersion>6.8.0-rc.112</NuGetBuildTasksVersion>
5657
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
57-
<SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
58+
<SystemTextJsonVersion>8.0.4</SystemTextJsonVersion>
5859
<SystemThreadingTasksDataflowVersion>7.0.0</SystemThreadingTasksDataflowVersion>
5960
</PropertyGroup>
6061
<Target Name="OverrideArcadeFileVersion" AfterTargets="_InitializeAssemblyVersion">

‎src/MSBuild/app.amd64.config

+10-10
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949

5050
<dependentAssembly>
5151
<assemblyIdentity name="Microsoft.IO.Redist" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
52-
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="6.0.0.0" />
53-
<codeBase version="6.0.0.0" href="..\Microsoft.IO.Redist.dll"/>
52+
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="6.0.0.1" />
53+
<codeBase version="6.0.0.1" href="..\Microsoft.IO.Redist.dll"/>
5454
</dependentAssembly>
5555

5656
<!-- Redirects for assemblies redistributed by MSBuild (in the .vsix). -->
@@ -68,8 +68,8 @@
6868
</dependentAssembly>
6969
<dependentAssembly>
7070
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
71-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
72-
<codeBase version="7.0.0.0" href="..\Microsoft.Bcl.AsyncInterfaces.dll"/>
71+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
72+
<codeBase version="8.0.0.0" href="..\Microsoft.Bcl.AsyncInterfaces.dll"/>
7373
</dependentAssembly>
7474
<dependentAssembly>
7575
<assemblyIdentity name="Microsoft.NET.StringTools" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -94,8 +94,8 @@
9494
<!-- Pull plugins that reference SCI up to our version in case they depended on our copy of the older version -->
9595
<dependentAssembly>
9696
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
97-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
98-
<codeBase version="7.0.0.0" href="..\System.Collections.Immutable.dll"/>
97+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
98+
<codeBase version="8.0.0.0" href="..\System.Collections.Immutable.dll"/>
9999
</dependentAssembly>
100100
<dependentAssembly>
101101
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -129,13 +129,13 @@
129129
</dependentAssembly>
130130
<dependentAssembly>
131131
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
132-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
133-
<codeBase version="7.0.0.0" href="..\System.Text.Encodings.Web.dll"/>
132+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
133+
<codeBase version="8.0.0.0" href="..\System.Text.Encodings.Web.dll"/>
134134
</dependentAssembly>
135135
<dependentAssembly>
136136
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
137-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.3" newVersion="7.0.0.3" />
138-
<codeBase version="7.0.0.3" href="..\System.Text.Json.dll"/>
137+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4" />
138+
<codeBase version="8.0.0.4" href="..\System.Text.Json.dll"/>
139139
</dependentAssembly>
140140
<dependentAssembly>
141141
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

‎src/MSBuild/app.config

+8-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@
4141
<!-- Redirects for assemblies redistributed by MSBuild (in the .vsix). -->
4242
<dependentAssembly>
4343
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
44-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
44+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
45+
</dependentAssembly>
46+
<dependentAssembly>
47+
<assemblyIdentity name="Microsoft.IO.Redist" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
48+
<bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
4549
</dependentAssembly>
4650
<dependentAssembly>
4751
<assemblyIdentity name="Microsoft.NET.StringTools" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -58,7 +62,7 @@
5862
<!-- Pull plugins that reference SCI up to our version in case they depended on our copy of the older version -->
5963
<dependentAssembly>
6064
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
61-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
65+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
6266
</dependentAssembly>
6367
<dependentAssembly>
6468
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -86,11 +90,11 @@
8690
</dependentAssembly>
8791
<dependentAssembly>
8892
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
89-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
93+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
9094
</dependentAssembly>
9195
<dependentAssembly>
9296
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
93-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.3" newVersion="7.0.0.3" />
97+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4" />
9498
</dependentAssembly>
9599
<dependentAssembly>
96100
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

0 commit comments

Comments
 (0)