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 #28584

Merged
merged 14 commits into from
Oct 20, 2022
Merged

[main] Update dependencies from dotnet/runtime #28584

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
84ba489
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 14, 2022
cad76db
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 15, 2022
c764eef
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 16, 2022
face93b
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 17, 2022
d4b914a
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 18, 2022
8068c7c
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 19, 2022
96af8be
Disabling linux testing until runtime #75468 is fixed
LakshanF Oct 19, 2022
f4657e7
removed debugging artifact
LakshanF Oct 19, 2022
df2d37d
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 20, 2022
d4aa91a
work around linux issue by using standard c lib
LakshanF Oct 20, 2022
6c1c132
Merge branch 'darc-main-ea02237a-f937-463c-a5a2-ef46b098f7a2' of http…
LakshanF Oct 20, 2022
eada16e
Update src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublish…
LakshanF Oct 20, 2022
621832c
FB
LakshanF Oct 20, 2022
c8b948c
Set LinkStandardCPlusPlusLibrary automatically on non-windows
agocke Oct 20, 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 @@ -6,41 +6,41 @@
<Sha>a266f9eb9a79d29e1664a1e8b18cc8e3d1f486bc</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.5.0-preview-22511-01">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -114,30 +114,30 @@
<Sha>6000a84c7e0b3678af032c25b7319aefdd057f6c</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22507.1">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>6000a84c7e0b3678af032c25b7319aefdd057f6c</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22512.3">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -284,9 +284,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>508fe921a748de6efc8b5d979e17beb88ccf5bcf</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22512.8">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22519.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d337cba786fa105d1b97ebe5e2f7f89ff0361627</Sha>
<Sha>6eb3ccb9507b74798c4bd3241587c4cf3b18866e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22507.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 @@ -35,26 +35,26 @@
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.22512.1</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22512.8</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22519.7</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22512.8</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22519.7</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.22504.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>8.0.0-alpha.1.22512.8</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22512.8</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22512.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22519.7</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22519.7</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22519.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22512.8</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22512.8</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22512.8</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22519.7</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22519.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22519.7</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
Expand Down Expand Up @@ -90,10 +90,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22512.8</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22512.8</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22512.8</SystemResourcesExtensionsPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>8.0.0-alpha.1.22512.8</MicrosoftDotNetILCompilerPackageVersion>
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22519.7</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22519.7</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22519.7</SystemResourcesExtensionsPackageVersion>
<MicrosoftDotNetILCompilerPackageVersion>8.0.0-alpha.1.22519.7</MicrosoftDotNetILCompilerPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand Down
5 changes: 5 additions & 0 deletions src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishANetCoreAppForTelemetry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@ public void It_collects_Aot_publishing_properties(string targetFramework)
// NativeAOT compilation requires PublishTrimmed and will be set to true if not set by the user
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
var testProject = CreateTestProject(targetFramework, "AotProject", aot: true);
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
// Workaround for https://github.com/dotnet/runtime/issues/75468. Delete once the issue is fixed.
testProject.AdditionalProperties["LinkStandardCPlusPlusLibrary"] = "true";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we put this in the targets file instead? That way it will actually work, instead of just passing this test.

}
testProject.AdditionalProperties["RuntimeIdentifier"] = rid;

var testProjectInstance = _testAssetsManager.CreateTestProject(testProject);
Expand Down
Loading