Skip to content

Commit 221b261

Browse files
YuliiaKovalovaYuliiaKovalova
committed
Merged PR 628249: [vs17.10] revert 10725 (code QL fixes)
revert 10725 The test run: https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=11407655&view=results
1 parent b0cdc26 commit 221b261

File tree

6 files changed

+18
-28
lines changed

6 files changed

+18
-28
lines changed

‎eng/Packages.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
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)" />
2322
<PackageVersion Include="System.Memory" Version="$(SystemMemoryVersion)" />
2423
<PackageVersion Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
2524
<PackageVersion Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<UsagePattern IdentityGlob="System.Collections.Immutable/*8.0.0*" />
99
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*8.0.0*" />
1010
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*8.0.0*" />
11-
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
11+
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.0*" />
1212
<UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
1313
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*8.0.0*" />
1414
<UsagePattern IdentityGlob="System.Resources.Extensions/*8.0.0*" />
1515
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/*8.0.0*" />
1616
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*8.0.0*" />
1717
<UsagePattern IdentityGlob="System.Security.Cryptography.Xml/*8.0.0*" />
18-
<UsagePattern IdentityGlob="System.Text.Json/*8.0.5*" />
18+
<UsagePattern IdentityGlob="System.Text.Json/*8.0.0*" />
1919
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
2020
</IgnorePatterns>
2121
<Usages>

‎eng/Version.Details.xml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
5454
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
5555
</Dependency>
56-
<Dependency Name="System.Text.Json" Version="8.0.5">
56+
<Dependency Name="System.Text.Json" Version="8.0.0">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58-
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
58+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
5959
</Dependency>
6060
<Dependency Name="System.Threading.Tasks.Dataflow" Version="8.0.0">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -65,10 +65,6 @@
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6666
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
6767
</Dependency>
68-
<Dependency Name="System.Formats.Asn1" Version="8.0.1">
69-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
70-
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
71-
</Dependency>
7268
</ProductDependencies>
7369
<ToolsetDependencies>
7470
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7">
@@ -100,9 +96,9 @@
10096
<Sha>919d4dbfb0dffb35a702417e28ceea652d248bc6</Sha>
10197
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
10298
</Dependency>
103-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25208.7">
99+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24172.5">
104100
<Uri>https://github.com/dotnet/arcade</Uri>
105-
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
101+
<Sha>ceb071c1060b8e6de404c065b4045442570caa18</Sha>
106102
</Dependency>
107103
</ToolsetDependencies>
108-
</Dependencies>
104+
</Dependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<PropertyGroup>
2828
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
2929
<SystemConfigurationConfigurationManagerVersion>8.0.0</SystemConfigurationConfigurationManagerVersion>
30-
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
3130
<!--
3231
Modifying the version of System.Memory is very high impact and causes downstream breaks in third-party tooling that uses the MSBuild API.
3332
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+
@@ -40,7 +39,7 @@
4039
<SystemResourcesExtensionsVersion>8.0.0</SystemResourcesExtensionsVersion>
4140
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
4241
<SystemTextEncodingCodePagesVersion>7.0.0</SystemTextEncodingCodePagesVersion>
43-
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
42+
<SystemTextJsonVersion>8.0.0</SystemTextJsonVersion>
4443
<SystemThreadingChannelsVersion>8.0.0</SystemThreadingChannelsVersion>
4544
<SystemThreadingTasksDataflowVersion>8.0.0</SystemThreadingTasksDataflowVersion>
4645
</PropertyGroup>
@@ -50,9 +49,9 @@
5049
Otherwise, this version of dotnet will not be installed and the build will error out. -->
5150
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
5251
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
53-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25208.7</MicrosoftDotNetXUnitExtensionsVersion>
52+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24172.5</MicrosoftDotNetXUnitExtensionsVersion>
5453
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
55-
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
54+
<MicrosoftIORedistVersion>6.0.0</MicrosoftIORedistVersion>
5655
<MicrosoftNetCompilersToolsetVersion>4.10.0-3.24175.2</MicrosoftNetCompilersToolsetVersion>
5756
<NuGetBuildTasksVersion>6.10.0-preview.2.81</NuGetBuildTasksVersion>
5857
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
@@ -73,4 +72,4 @@
7372
<FileVersion>$(VersionPrefix).$(FileVersion.Split('.')[3])</FileVersion>
7473
</PropertyGroup>
7574
</Target>
76-
</Project>
75+
</Project>

‎src/MSBuild/app.amd64.config‎

Lines changed: 5 additions & 5 deletions
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.1" />
53-
<codeBase version="6.0.0.1" href="..\Microsoft.IO.Redist.dll"/>
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"/>
5454
</dependentAssembly>
5555

5656
<!-- Redirects for assemblies redistributed by MSBuild (in the .vsix). -->
@@ -134,8 +134,8 @@
134134
</dependentAssembly>
135135
<dependentAssembly>
136136
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
137-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
138-
<codeBase version="8.0.0.5" href="..\System.Text.Json.dll"/>
137+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
138+
<codeBase version="8.0.0.0" href="..\System.Text.Json.dll"/>
139139
</dependentAssembly>
140140
<dependentAssembly>
141141
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -229,4 +229,4 @@
229229
</projectImportSearchPaths>
230230
</toolset>
231231
</msbuildToolsets>
232-
</configuration>
232+
</configuration>

‎src/MSBuild/app.config‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@
4343
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
4444
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
4545
</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" />
49-
</dependentAssembly>
5046
<dependentAssembly>
5147
<assemblyIdentity name="Microsoft.NET.StringTools" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
5248
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
@@ -94,7 +90,7 @@
9490
</dependentAssembly>
9591
<dependentAssembly>
9692
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
97-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
93+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
9894
</dependentAssembly>
9995
<dependentAssembly>
10096
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -182,4 +178,4 @@
182178
</projectImportSearchPaths>
183179
</toolset>
184180
</msbuildToolsets>
185-
</configuration>
181+
</configuration>

0 commit comments

Comments
 (0)