Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[main] Update dependencies from dotnet/runtime #26470

Merged
merged 7 commits into from
Jul 12, 2022
Merged

[main] Update dependencies from dotnet/runtime #26470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ed4f5b9
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jul 7, 2022
6d4068d
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-b…
v-wuzhai Jul 8, 2022
76214a1
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jul 8, 2022
01205a0
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jul 9, 2022
2049f4f
Merge branch 'main' into darc-main-b0738762-11d1-4f67-ac23-7d84d59127d1
pavelsavara Jul 11, 2022
68796b4
Revert test back to targeting net6.0 as targeting 7 required a specif…
marcpopMSFT Jul 11, 2022
eea9645
Switch to strings as I test this locally.
marcpopMSFT Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,41 +26,41 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>881db32da345c570ac30400b1ccbf8ad88b37ccf</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.6.22356.1">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.6.22356.1">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-preview.6.22356.1">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.6.22356.1">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-preview.6.22356.1">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-preview.6.22356.1">
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-preview.6.22356.1">
<Dependency Name="Microsoft.NET.HostModel" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-preview.6.22356.1">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-preview.6.22356.1">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.3.0-preview-22330-03">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -130,30 +130,30 @@
<Sha>81c90bb373ea41104638d024a3846a3ce3de1fd1</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-preview.6.22356.1">
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22359.1">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>81c90bb373ea41104638d024a3846a3ce3de1fd1</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="7.0.0-preview.6.22356.1">
<Dependency Name="System.CodeDom" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-preview.6.22356.1">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-preview.6.22356.1">
<Dependency Name="System.Text.Encoding.CodePages" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="7.0.0-preview.6.22356.1">
<Dependency Name="System.Resources.Extensions" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-preview.7.22357.2">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -297,9 +297,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a264eb13fea14125f3ef8d4056586cd66fa55309</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-preview.6.22356.1">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-preview.7.22358.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>206dccb7945aaa3f26599fbe742de9022ca7ef91</Sha>
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22325.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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,26 @@
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>7.0.0-beta.22327.2</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-preview.6.22356.1</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.0-preview.7.22358.7</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.6.22356.1</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>7.0.0-preview.7.22358.7</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.22326.1</SystemCommandLineVersion>
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview5.1.22263.1</MicrosoftDeploymentDotNetReleasesVersion>
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.6.22356.1</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.6.22356.1</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-preview.6.22356.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.7.22358.7</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.7.22358.7</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-preview.7.22358.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-preview.6.22356.1</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-preview.6.22356.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>7.0.0-preview.6.22356.1</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-preview.7.22358.7</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-preview.7.22358.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>7.0.0-preview.7.22358.7</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 @@ -88,10 +88,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>7.0.0-preview.6.22356.1</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>7.0.0-preview.6.22356.1</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>7.0.0-preview.6.22356.1</SystemResourcesExtensionsPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>7.0.0-preview.6.22356.1</MicrosoftDotNetILCompilerPackageVersion>
<SystemCodeDomPackageVersion>7.0.0-preview.7.22358.7</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>7.0.0-preview.7.22358.7</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>7.0.0-preview.7.22358.7</SystemResourcesExtensionsPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>7.0.0-preview.7.22358.7</MicrosoftDotNetILCompilerPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand Down
8 changes: 4 additions & 4 deletions src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAProjectWithAllFeatures.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ public void It_publishes_the_project_correctly(string targetFramework, string []
// TestLibrary has a hard dependency on Newtonsoft.Json.
// TestApp has a PrivateAssets=All dependency on Microsoft.Extensions.DependencyModel, which depends on Newtonsoft.Json.
// This verifies that P2P references get walked correctly when doing PrivateAssets exclusion.
VerifyDependency(dependencyContext, "Newtonsoft.Json", targetFramework == ToolsetInfo.CurrentTargetFramework ? "lib/netstandard2.0/" : "lib/netstandard1.3/", null);
VerifyDependency(dependencyContext, "Newtonsoft.Json", targetFramework == "net6.0" ? "lib/netstandard2.0/" : "lib/netstandard1.3/", null);

// Verify P2P references get created correctly in the .deps.json file.
VerifyDependency(dependencyContext, "TestLibrary", "", null,
"da", "de", "fr");

// Verify package reference with satellites gets created correctly in the .deps.json file
VerifyDependency(dependencyContext, "Humanizer.Core", targetFramework == ToolsetInfo.CurrentTargetFramework ? "lib/netstandard2.0/" : "lib/netstandard1.0/", "Humanizer",
VerifyDependency(dependencyContext, "Humanizer.Core", targetFramework == "net6.0" ? "lib/netstandard2.0/" : "lib/netstandard1.0/", "Humanizer",
"af", "ar", "az", "bg", "bn-BD", "cs", "da", "de", "el", "es", "fa", "fi-FI", "fr", "fr-BE", "he", "hr",
"hu", "hy", "id", "it", "ja", "lv", "ms-MY", "mt", "nb", "nb-NO", "nl", "pl", "pt", "ro", "ru", "sk", "sl", "sr",
"sr-Latn", "sv", "tr", "uk", "uz-Cyrl-UZ", "uz-Latn-UZ", "vi", "zh-CN", "zh-Hans", "zh-Hant");
Expand Down Expand Up @@ -106,7 +106,7 @@ public void It_publishes_the_project_correctly(string targetFramework, string []
}");
baselineConfigJsonObject["runtimeOptions"]["tfm"] = targetFramework;
baselineConfigJsonObject["runtimeOptions"]["framework"]["version"] =
targetFramework == ToolsetInfo.CurrentTargetFramework ? "7.0.0-preview.6.22356.1" : "1.1.2";
targetFramework == "net6.0" ? "6.0.0" : "1.1.2";

runtimeConfigJsonObject
.Should()
Expand Down Expand Up @@ -244,7 +244,7 @@ public static IEnumerable<object[]> PublishData
get
{
yield return new object[] {
ToolsetInfo.CurrentTargetFramework,
"net6.0",
new string[]
{
"TestApp.dll",
Expand Down