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

Merged
merged 18 commits into from
Dec 19, 2022
Merged

[main] Update dependencies from dotnet/runtime #29406

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
fb7200b
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 6, 2022
0b75866
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 7, 2022
512b80e
Remove `--skip-manifest-update` for `workload install` command as a
radical Dec 7, 2022
a1e2e74
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 8, 2022
4addacb
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 9, 2022
0456164
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 10, 2022
067bc1c
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 11, 2022
36f0999
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 12, 2022
7f3e462
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 13, 2022
8d26e74
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 14, 2022
a37ab47
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 15, 2022
a9d35c8
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 16, 2022
5f7871d
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 17, 2022
48994c4
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 18, 2022
a0d0040
Skip failing single-file tests
agocke Dec 19, 2022
906864b
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 19, 2022
7b49dde
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 19, 2022
d4be9cb
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Dec 19, 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
56 changes: 28 additions & 28 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>4e62530745f1c53b7796a35fbda531007cb62ece</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22605.1">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22619.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22605.1">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22619.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22605.1">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22619.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22605.1">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22619.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22605.1">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22619.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22605.1">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22619.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22605.1">
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22619.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22605.1">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22619.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22605.1">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22619.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.5.0-preview-22601-03">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down Expand Up @@ -118,21 +118,21 @@
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>f3469ca5e80e3701d90f8a376371eda940ba9687</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22605.1">
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22619.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22605.1">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22619.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22605.1">
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22619.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22605.1">
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22619.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22604.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -279,9 +279,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22605.1">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22619.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22576.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down
22 changes: 11 additions & 11 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.22579.2</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22605.1</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22619.2</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.22605.1</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22619.2</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.22564.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.22605.1</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22605.1</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22605.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22619.2</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22619.2</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22619.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22605.1</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22605.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22605.1</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22619.2</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22619.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22619.2</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
Expand Down Expand Up @@ -90,9 +90,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22605.1</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22605.1</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22605.1</SystemResourcesExtensionsPackageVersion>
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22619.2</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22619.2</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22619.2</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand Down
8 changes: 6 additions & 2 deletions eng/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,9 @@ jobs:
BuildConfig: $(_BuildConfig)
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
HelixAccessToken: ${{ parameters.HelixAccessToken }}
- script: $(Build.SourcesDirectory)/artifacts/bin/redist/$(_BuildConfig)/dotnet/dotnet workload install wasm-tools --skip-manifest-update
- script: $(Build.SourcesDirectory)/artifacts/bin/redist/$(_BuildConfig)/dotnet/dotnet workload install wasm-tools
# FIXME: add `--skip-manifest-update` back once the problem in
# https://github.com/dotnet/sdk/pull/29406#issuecomment-1341643680 has been resolved.
displayName: Install wasm-tools Workload
continueOnError: false
- powershell: $(Build.SourcesDirectory)/eng/common/build.ps1
Expand Down Expand Up @@ -288,7 +290,9 @@ jobs:
displayName: Build
env:
BuildConfig: $(_BuildConfig)
- script: $(Build.SourcesDirectory)/artifacts/bin/redist/$(_BuildConfig)/dotnet/dotnet workload install wasm-tools --skip-manifest-update
- script: $(Build.SourcesDirectory)/artifacts/bin/redist/$(_BuildConfig)/dotnet/dotnet workload install wasm-tools
# FIXME: add `--skip-manifest-update` back once the problem in
# https://github.com/dotnet/sdk/pull/29406#issuecomment-1341643680 has been resolved.
displayName: Install wasm-tools Workload
continueOnError: false
- script: eng/common/build.sh
Expand Down
11 changes: 6 additions & 5 deletions src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ private DirectoryInfo GetPublishDirectory(PublishCommand publishCommand, string
runtimeIdentifier: RuntimeInformation.RuntimeIdentifier);
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/sdk/issues/29602")]
public void Incremental_add_single_file()
{
var testProject = new TestProject()
Expand Down Expand Up @@ -678,9 +678,10 @@ static void ProduceLinkerAnalysisWarning()
[InlineData(ToolsetInfo.CurrentTargetFramework, false, IncludeDefault)]
[InlineData(ToolsetInfo.CurrentTargetFramework, false, IncludeNative)]
[InlineData(ToolsetInfo.CurrentTargetFramework, false, IncludeAllContent)]
[InlineData(ToolsetInfo.CurrentTargetFramework, true, IncludeDefault)]
[InlineData(ToolsetInfo.CurrentTargetFramework, true, IncludeNative)]
[InlineData(ToolsetInfo.CurrentTargetFramework, true, IncludeAllContent)]
// https://github.com/dotnet/sdk/issues/29602
//[InlineData(ToolsetInfo.CurrentTargetFramework, true, IncludeDefault)]
//[InlineData(ToolsetInfo.CurrentTargetFramework, true, IncludeNative)]
//[InlineData(ToolsetInfo.CurrentTargetFramework, true, IncludeAllContent)]
public void It_runs_single_file_apps(string targetFramework, bool selfContained, string bundleOption)
{
var testProject = new TestProject()
Expand Down Expand Up @@ -841,7 +842,7 @@ public void It_does_not_compress_single_file_by_default()
uncompressedSize.Should().Be(compressedSize);
}

[RequiresMSBuildVersionFact("17.0.0.32901")]
[Fact(Skip = "https://github.com/dotnet/sdk/issues/29602")]
public void User_can_get_bundle_info_before_bundling()
{
var testProject = new TestProject()
Expand Down