Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/runtime (#31139)
Browse files Browse the repository at this point in the history
  • Loading branch information
@v-wuzhai
v-wuzhai authored Mar 14, 2023
2 parents c4b63ef + 863734a commit 3f4fd12
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 42 deletions.
60 changes: 30 additions & 30 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,41 @@
<Sha>729640b4592d9bb922143cc978bfc8e54309b198</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.3.23160.6">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.3.23160.6">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.3.23160.6">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.3.23160.6">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.3.23160.6">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.3.23160.6">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-preview.3.23160.6">
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-preview.3.23160.6">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.3.23160.6">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.6.0-preview-23163-03">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -109,29 +109,29 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>05c0c4c4f084782533443dfeae0f6627018c5b6a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.3.23160.6">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="8.0.100-1.23067.1">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>c790896f128957acd2999208f44f09ae1e826c8c</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="8.0.0-preview.3.23160.6">
<Dependency Name="System.CodeDom" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-preview.3.23160.6">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-preview.3.23160.6">
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="8.0.0-preview.3.23160.6">
<Dependency Name="System.Resources.Extensions" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-preview.3.23160.3">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -285,9 +285,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-preview.3.23160.6">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-preview.3.23163.5">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c887c92d8af4ce65b19962b777f96ae8eb997a42</Sha>
<Sha>e247ef3c03f5dae7ed634d83ec53e1386e5fe57d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23116.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down
24 changes: 12 additions & 12 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,30 +34,30 @@
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23120.1</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-preview.3.23160.6</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-preview.3.23163.5</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>7.0.2</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-preview.3.23160.6</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-preview.3.23163.5</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.22564.1</SystemCommandLineVersion>
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview6.1.23159.4</MicrosoftDeploymentDotNetReleasesVersion>
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.3.23160.6</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.3.23160.6</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.3.23160.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.3.23163.5</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.3.23163.5</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.3.23163.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-preview.3.23160.6</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.3.23160.6</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-preview.3.23160.6</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-preview.3.23163.5</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.3.23163.5</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-preview.3.23163.5</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.3.23160.6</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.3.23163.5</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>7.0.0</SystemServiceProcessServiceControllerVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down Expand Up @@ -85,9 +85,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>8.0.0-preview.3.23160.6</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-preview.3.23160.6</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-preview.3.23160.6</SystemResourcesExtensionsPackageVersion>
<SystemCodeDomPackageVersion>8.0.0-preview.3.23163.5</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-preview.3.23163.5</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-preview.3.23163.5</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand Down
8 changes: 8 additions & 0 deletions src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToFloatWarningLevels.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,14 @@ public static void CA1031_All()
testProject.AdditionalProperties.Add("AnalysisLevel", analysisLevel);
testProject.AdditionalProperties.Add("CodeAnalysisTreatWarningsAsErrors", codeAnalysisTreatWarningsAsErrors);

// Don't emit a warning or an error when generators/analyzers can't be loaded.
// This can occur when running tests against FullFramework MSBuild
// if the build machine has an MSBuild install with an older version of Roslyn
// than the generators in the SDK reference. We aren't testing the generators here
// and this failure will occur more clearly in other places when it's
// actually an important failure, so don't error out here.
testProject.AdditionalProperties.Add("NoWarn", "CS9057");

var testAsset = _testAssetsManager
.CreateTestProject(testProject, identifier: "analysisLevelConsoleApp" + ToolsetInfo.CurrentTargetFramework + analysisLevel + $"Warnaserror:{codeAnalysisTreatWarningsAsErrors}", targetExtension: ".csproj");

Expand Down

0 comments on commit 3f4fd12

Please sign in to comment.