Skip to content

[main] Update dependencies from dotnet/runtime #34522

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

Merged
merged 18 commits into from
Aug 13, 2023
Merged

[main] Update dependencies from dotnet/runtime #34522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
be924c5
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 8, 2023
5e0a457
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 8, 2023
b8bef73
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 9, 2023
63719f3
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 9, 2023
c3f532e
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 9, 2023
964a311
Update tests for embedding clsidmap in comhost
elinor-fung Aug 9, 2023
b56c211
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 9, 2023
69ec945
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 10, 2023
5fd22d2
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 10, 2023
67aabe9
Fix ICU tests.
ilonatommy Aug 10, 2023
1a7fbda
Re-generate baseline. Reason: the default app has only ICU shards - n…
ilonatommy Aug 10, 2023
7220f03
Revert "Re-generate baseline. Reason: the default app has only ICU sh…
ilonatommy Aug 10, 2023
c2858ed
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 10, 2023
d3c6e41
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 11, 2023
d043962
Try to update Blazor baselines
v-wuzhai Aug 11, 2023
44344b4
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 11, 2023
6e999c9
Change symbol suffix from .dwarf to .dsym
agocke Aug 11, 2023
d5a8fd1
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Aug 13, 2023
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
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,46 +6,46 @@
<Sha>0e3b87e0fdf3026c45c7b489a5f5e108fb4f7cdf</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.1.23408.3">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23408.3">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
<SourceBuild RepoName="runtime" ManagedOnly="false" />
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-rc.1.23408.3">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23408.3">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-rc.1.23408.3">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-rc.1.23408.3">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-rc.1.23408.3">
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.1.23408.3">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-rc.1.23408.3">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23402.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23411.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>7a17b406530ad1d08895bcb1eeb8a64c62951da6</Sha>
<Sha>abfa03c97f4175d4d209435cd0e71f558e36c3fd</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.8.0-preview-23408-02">
Expand Down Expand Up @@ -189,25 +189,25 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>14a299529957175bb8613eac57a3a6a7b5020dea</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23408.3">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="8.0.0-rc.1.23408.3">
<Dependency Name="System.CodeDom" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-rc.1.23408.3">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23408.3">
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="8.0.0-rc.1.23408.3">
<Dependency Name="System.Resources.Extensions" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-rc.1.23408.2">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -382,19 +382,19 @@
<SourceBuild RepoName="symreader" ManagedOnly="true" />
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.1.23408.3">
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0-rc.1.23408.3">
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-rc.1.23408.3">
<Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand All @@ -415,9 +415,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9a7b1d30fd536da1b71d74b184e857ee96c12a76</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-rc.1.23408.3">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-rc.1.23413.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>749b2d2f70d8d60834fd8628ed70c694a0a45403</Sha>
<Sha>af651f48d07c87c94e1225859e63e919719b687b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23381.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,31 @@
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23407.1</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-rc.1.23408.3</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-rc.1.23413.2</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-rc.1.23408.3</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-rc.1.23413.2</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview.6.23403.1</MicrosoftDeploymentDotNetReleasesVersion>
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23408.3</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23408.3</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-rc.1.23408.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23413.2</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23413.2</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-rc.1.23413.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-rc.1.23408.3</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23408.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-rc.1.23408.3</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0-rc.1.23408.3</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-rc.1.23413.2</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23413.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-rc.1.23413.2</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0-rc.1.23413.2</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-rc.1.23408.3</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23408.3</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>8.0.0-rc.1.23408.3</SystemServiceProcessServiceControllerVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-rc.1.23413.2</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23413.2</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>8.0.0-rc.1.23413.2</SystemServiceProcessServiceControllerVersion>
<MicrosoftExtensionsLoggingPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
</PropertyGroup>
Expand Down Expand Up @@ -88,9 +88,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>8.0.0-rc.1.23408.3</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-rc.1.23408.3</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-rc.1.23408.3</SystemResourcesExtensionsPackageVersion>
<SystemCodeDomPackageVersion>8.0.0-rc.1.23413.2</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-rc.1.23413.2</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-rc.1.23413.2</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand Down Expand Up @@ -208,7 +208,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Workloads from dotnet/emsdk -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0-rc.1.23402.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0-rc.1.23411.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
<EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
Expand Down
26 changes: 1 addition & 25 deletions src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAComServerLibrary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void It_generates_a_regfree_com_manifest_when_requested()
});
}

[WindowsOnlyTheory]
[Theory]
[InlineData($"{ToolsetInfo.LatestWinRuntimeIdentifier}-x64")]
[InlineData($"{ToolsetInfo.LatestWinRuntimeIdentifier}-x86")]
public void It_embeds_the_clsidmap_in_the_comhost_when_rid_specified(string rid)
Expand Down Expand Up @@ -147,30 +147,6 @@ public void It_fails_to_find_comhost_for_platforms_without_comhost()
.HaveStdOutContaining("NETSDK1091: ");
}

[PlatformSpecificTheory(TestPlatforms.Linux | TestPlatforms.OSX | TestPlatforms.FreeBSD)]
[InlineData($"{ToolsetInfo.LatestWinRuntimeIdentifier}-x64")]
[InlineData($"{ToolsetInfo.LatestWinRuntimeIdentifier}-x86")]
public void It_fails_to_embed_clsid_when_not_on_windows(string rid)
{
var testAsset = _testAssetsManager
.CopyTestAsset("ComServer", identifier: rid)
.WithSource()
.WithProjectChanges(project =>
{
var ns = project.Root.Name.Namespace;
var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First();
propertyGroup.Add(new XElement("RuntimeIdentifier", rid));
});

var buildCommand = new BuildCommand(testAsset);
buildCommand
.Execute()
.Should()
.Fail()
.And
.HaveStdOutContaining("NETSDK1092: ");
}

[WindowsOnlyFact]
public void It_embeds_single_typelib_with_default_id()
{
Expand Down
Loading