Skip to content

[main] Update dependencies from dotnet/runtime #24985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 26, 2022
Merged
60 changes: 30 additions & 30 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,41 +26,41 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>d381f307413f95af117c6e5afa81979970d582a5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.4.22219.9">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e3442b43424f040faca7611d4bcf53a357397df8</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.4.22219.9">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e3442b43424f040faca7611d4bcf53a357397df8</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-preview.4.22219.9">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e3442b43424f040faca7611d4bcf53a357397df8</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.4.22219.9">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e3442b43424f040faca7611d4bcf53a357397df8</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-preview.4.22219.9">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e3442b43424f040faca7611d4bcf53a357397df8</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-preview.4.22219.9">
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e3442b43424f040faca7611d4bcf53a357397df8</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-preview.4.22219.9">
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e3442b43424f040faca7611d4bcf53a357397df8</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-preview.4.22219.9">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e3442b43424f040faca7611d4bcf53a357397df8</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-preview.4.22219.9">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e3442b43424f040faca7611d4bcf53a357397df8</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.3.0-preview-22221-08">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -130,30 +130,30 @@
<Sha>dec9a23c4c164111df76d427656357113c0d705a</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-preview.4.22219.9">
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f1e10a53132cc648cea914e75f953ff5a5087399</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22222.1">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>dec9a23c4c164111df76d427656357113c0d705a</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="7.0.0-preview.4.22219.9">
<Dependency Name="System.CodeDom" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e3442b43424f040faca7611d4bcf53a357397df8</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-preview.4.22219.9">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e3442b43424f040faca7611d4bcf53a357397df8</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-preview.4.22219.9">
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e3442b43424f040faca7611d4bcf53a357397df8</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="7.0.0-preview.4.22219.9">
<Dependency Name="System.Resources.Extensions" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e3442b43424f040faca7611d4bcf53a357397df8</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-preview.5.22224.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -293,9 +293,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5f04b602a86b74f6cdd12f48aca2d1868e6425f3</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-preview.4.22219.9">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-preview.5.22224.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e3442b43424f040faca7611d4bcf53a357397df8</Sha>
<Sha>47d9c43ab1f10a98a348a28b3fd7ed9c4d35328b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22221.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
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,26 @@
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>7.0.0-beta.22222.4</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-preview.4.22219.9</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-preview.5.22224.3</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>7.0.0-preview.4.22219.9</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>7.0.0-preview.5.22224.3</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta3.22222.1</SystemCommandLineVersion>
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview3.6.22115.1</MicrosoftDeploymentDotNetReleasesVersion>
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.4.22219.9</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.4.22219.9</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-preview.4.22219.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.5.22224.3</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.5.22224.3</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-preview.5.22224.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-preview.4.22219.9</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-preview.4.22219.9</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>7.0.0-preview.4.22219.9</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-preview.5.22224.3</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-preview.5.22224.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>7.0.0-preview.5.22224.3</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
<SystemServiceProcessServiceControllerVersion>7.0.0-preview.4.22201.3</SystemServiceProcessServiceControllerVersion>
Expand Down Expand Up @@ -87,10 +87,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>7.0.0-preview.4.22219.9</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>7.0.0-preview.4.22219.9</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>7.0.0-preview.4.22219.9</SystemResourcesExtensionsPackageVersion>
<MicrosoftNETILCompilerPackageVersion>7.0.0-preview.4.22219.9</MicrosoftNETILCompilerPackageVersion>
<SystemCodeDomPackageVersion>7.0.0-preview.5.22224.3</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>7.0.0-preview.5.22224.3</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>7.0.0-preview.5.22224.3</SystemResourcesExtensionsPackageVersion>
<MicrosoftNETILCompilerPackageVersion>7.0.0-preview.5.22222.1</MicrosoftNETILCompilerPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ public void It_resolves_analyzers_correctly(string language, string testAssetNam
("microsoft.netcore.app.ref", (string)null, "analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.dll"),
("microsoft.codequality.analyzers", "2.6.0", "analyzers/dotnet/cs/Microsoft.CodeQuality.Analyzers.dll"),
("microsoft.codequality.analyzers", "2.6.0", "analyzers/dotnet/cs/Microsoft.CodeQuality.CSharp.Analyzers.dll"),
("microsoft.dependencyvalidation.analyzers", "0.9.0", "analyzers/dotnet/Microsoft.DependencyValidation.Analyzers.dll")

("microsoft.dependencyvalidation.analyzers", "0.9.0", "analyzers/dotnet/Microsoft.DependencyValidation.Analyzers.dll"),
("microsoft.netcore.app.ref", (string)null, "analyzers/dotnet/Microsoft.Interop.LibraryImportGenerator.dll"),
("microsoft.netcore.app.ref", (string)null, "analyzers/dotnet/Microsoft.Interop.SourceGeneration.dll")
);
break;

Expand All @@ -80,12 +81,17 @@ public void It_resolves_analyzers_correctly(string language, string testAssetNam
("Microsoft.NET.Sdk", (string)null, "analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll"),
("microsoft.codequality.analyzers", "2.6.0", "analyzers/dotnet/vb/Microsoft.CodeQuality.Analyzers.dll"),
("microsoft.codequality.analyzers", "2.6.0", "analyzers/dotnet/vb/Microsoft.CodeQuality.VisualBasic.Analyzers.dll"),
("microsoft.dependencyvalidation.analyzers", "0.9.0", "analyzers/dotnet/Microsoft.DependencyValidation.Analyzers.dll")
("microsoft.dependencyvalidation.analyzers", "0.9.0", "analyzers/dotnet/Microsoft.DependencyValidation.Analyzers.dll"),
("microsoft.netcore.app.ref", (string)null, "analyzers/dotnet/Microsoft.Interop.LibraryImportGenerator.dll"),
("microsoft.netcore.app.ref", (string)null, "analyzers/dotnet/Microsoft.Interop.SourceGeneration.dll")
);
break;

case "F#":
analyzers.Should().BeEmpty();
analyzers.Select(x => GetPackageAndPath(x)).Should().BeEquivalentTo(
("microsoft.netcore.app.ref", (string)null, "analyzers/dotnet/Microsoft.Interop.LibraryImportGenerator.dll"),
("microsoft.netcore.app.ref", (string)null, "analyzers/dotnet/Microsoft.Interop.SourceGeneration.dll")
);
break;

default:
Expand Down Expand Up @@ -132,7 +138,7 @@ public void It_resolves_multitargeted_analyzers()

return getValuesCommand.GetValues().Select(x => GetPackageAndPath(x)).ToList();
}

GetAnalyzersForTargetFramework("net6.0").Should().BeEquivalentTo(("system.text.json", "6.0.0-preview.4.21253.7", "analyzers/dotnet/cs/System.Text.Json.SourceGeneration.dll"));
GetAnalyzersForTargetFramework("net472").Should().BeEmpty();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1036,6 +1036,23 @@
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Formats.Asn1.dll"
},
{
"Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Formats.Tar.dll",
"SourceId": "blazorwasm-minimal",
"SourceType": "Computed",
"ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\",
"BasePath": "/",
"RelativePath": "_framework/System.Formats.Tar.dll",
"AssetKind": "Build",
"AssetMode": "All",
"AssetRole": "Primary",
"RelatedAsset": "",
"AssetTraitName": "BlazorWebAssemblyResource",
"AssetTraitValue": "runtime",
"CopyToOutputDirectory": "PreserveNewest",
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${RestorePath}\\microsoft.netcore.app.runtime.mono.browser-wasm\\${RuntimeVersion}\\runtimes\\browser-wasm\\lib\\${Tfm}\\System.Formats.Tar.dll"
},
{
"Identity": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Globalization.Calendars.dll",
"SourceId": "blazorwasm-minimal",
Expand Down Expand Up @@ -4453,6 +4470,23 @@
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Formats.Asn1.dll"
},
{
"Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Formats.Tar.dll.gz]]",
"SourceId": "blazorwasm-minimal",
"SourceType": "Computed",
"ContentRoot": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\",
"BasePath": "/",
"RelativePath": "_framework/System.Formats.Tar.dll.gz",
"AssetKind": "Build",
"AssetMode": "All",
"AssetRole": "Alternative",
"RelatedAsset": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Formats.Tar.dll",
"AssetTraitName": "Content-Encoding",
"AssetTraitValue": "gzip",
"CopyToOutputDirectory": "PreserveNewest",
"CopyToPublishDirectory": "Never",
"OriginalItemSpec": "${ProjectRoot}\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Formats.Tar.dll"
},
{
"Identity": "${ProjectRoot}\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Globalization.Calendars.dll.gz]]",
"SourceId": "blazorwasm-minimal",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Dynamic.Runtime.dll.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Formats.Asn1.dll",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Formats.Asn1.dll.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Formats.Tar.dll",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Formats.Tar.dll.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Globalization.Calendars.dll",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Globalization.Calendars.dll.gz",
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Globalization.Extensions.dll",
Expand Down Expand Up @@ -534,6 +536,7 @@
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Drawing.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Dynamic.Runtime.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Formats.Asn1.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Formats.Tar.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Globalization.Calendars.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Globalization.Extensions.dll.gz]]",
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\build-gz\\[[_framework/System.Globalization.dll.gz]]",
Expand Down
Loading