Skip to content

Commit ac93651

Browse files
dotnet-maestro[bot]radical
dotnet-maestro[bot]
and
radical
authoredDec 19, 2022
[main] Update dependencies from dotnet/runtime (#29406)
* Update dependencies from https://github.com/dotnet/runtime build 20221205.5 Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-alpha.1.22605.1 -> To Version 8.0.0-alpha.1.22605.5 * Update dependencies from https://github.com/dotnet/runtime build 20221206.7 Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-alpha.1.22605.1 -> To Version 8.0.0-alpha.1.22606.7 * Remove `--skip-manifest-update` for `workload install` command as a .. workaround. ths issue is described in #29406 (comment), and #29406 (comment) . * Update dependencies from https://github.com/dotnet/runtime build 20221207.6 Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-alpha.1.22605.1 -> To Version 8.0.0-alpha.1.22607.6 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Ankit Jain <[email protected]>
·
v10.0.100-preview.2.25164.34v8.0.100-preview.1.23114.32
1 parent 5932298 commit ac93651

File tree

4 files changed

+51
-46
lines changed

4 files changed

+51
-46
lines changed
 

‎eng/Version.Details.xml

+28-28
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,41 @@
66
<Sha>ded4b54c7cb41ff433e585cb981ecd032d7f6c27</Sha>
77
<SourceBuild RepoName="templating" ManagedOnly="true" />
88
</Dependency>
9-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22605.1">
9+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.22619.2">
1010
<Uri>https://github.com/dotnet/runtime</Uri>
11-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
11+
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
1212
</Dependency>
13-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22605.1">
13+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22619.2">
1414
<Uri>https://github.com/dotnet/runtime</Uri>
15-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
15+
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
1616
</Dependency>
17-
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22605.1">
17+
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22619.2">
1818
<Uri>https://github.com/dotnet/runtime</Uri>
19-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
19+
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22605.1">
21+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.22619.2">
2222
<Uri>https://github.com/dotnet/runtime</Uri>
23-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
23+
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22605.1">
25+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.22619.2">
2626
<Uri>https://github.com/dotnet/runtime</Uri>
27-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
27+
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22605.1">
29+
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.22619.2">
3030
<Uri>https://github.com/dotnet/runtime</Uri>
31-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
31+
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22605.1">
33+
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-alpha.1.22619.2">
3434
<Uri>https://github.com/dotnet/runtime</Uri>
35-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
35+
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22605.1">
37+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-alpha.1.22619.2">
3838
<Uri>https://github.com/dotnet/runtime</Uri>
39-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
39+
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22605.1">
41+
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.22619.2">
4242
<Uri>https://github.com/dotnet/runtime</Uri>
43-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
43+
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.Build" Version="17.5.0-preview-22615-01">
4646
<Uri>https://github.com/dotnet/msbuild</Uri>
@@ -118,21 +118,21 @@
118118
<Uri>https://github.com/dotnet/linker</Uri>
119119
<Sha>2db841fc5f6bc7592b66ffe3bd0e1c888d022f93</Sha>
120120
</Dependency>
121-
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22605.1">
121+
<Dependency Name="System.CodeDom" Version="8.0.0-alpha.1.22619.2">
122122
<Uri>https://github.com/dotnet/runtime</Uri>
123-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
123+
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
124124
</Dependency>
125-
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22605.1">
125+
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-alpha.1.22619.2">
126126
<Uri>https://github.com/dotnet/runtime</Uri>
127-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
127+
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
128128
</Dependency>
129-
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22605.1">
129+
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-alpha.1.22619.2">
130130
<Uri>https://github.com/dotnet/runtime</Uri>
131-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
131+
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
132132
</Dependency>
133-
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22605.1">
133+
<Dependency Name="System.Resources.Extensions" Version="8.0.0-alpha.1.22619.2">
134134
<Uri>https://github.com/dotnet/runtime</Uri>
135-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
135+
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
136136
</Dependency>
137137
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22616.1">
138138
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -279,9 +279,9 @@
279279
<Uri>https://github.com/dotnet/arcade</Uri>
280280
<Sha>5da4fd65d650129f1771e2fb55e296161b654b85</Sha>
281281
</Dependency>
282-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22605.1">
282+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22619.2">
283283
<Uri>https://github.com/dotnet/runtime</Uri>
284-
<Sha>1a37caf773a3b857ccff49a31be3333d4fdc491f</Sha>
284+
<Sha>62013d86608b1f8923bf9bd901bb4c8ced7b20a9</Sha>
285285
</Dependency>
286286
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22614.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
287287
<Uri>https://github.com/dotnet/xliff-tasks</Uri>

‎eng/Versions.props

+11-11
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,26 @@
3535
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
3636
<MicrosoftDotNetSignToolVersion>8.0.0-beta.22615.3</MicrosoftDotNetSignToolVersion>
3737
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
38-
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22605.1</SystemSecurityCryptographyProtectedDataPackageVersion>
38+
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22619.2</SystemSecurityCryptographyProtectedDataPackageVersion>
3939
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
4040
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
4141
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
4242
<SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
43-
<SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22605.1</SystemReflectionMetadataLoadContextVersion>
43+
<SystemReflectionMetadataLoadContextVersion>8.0.0-alpha.1.22619.2</SystemReflectionMetadataLoadContextVersion>
4444
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
4545
<SystemCommandLineVersion>2.0.0-beta4.22564.1</SystemCommandLineVersion>
4646
<MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview5.1.22263.1</MicrosoftDeploymentDotNetReleasesVersion>
4747
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.0.4496</MicrosoftVisualStudioSetupConfigurationInteropVersion>
4848
</PropertyGroup>
4949
<PropertyGroup>
5050
<!-- Dependencies from https://github.com/dotnet/runtime -->
51-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22605.1</MicrosoftNETCoreAppRefPackageVersion>
52-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22605.1</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
53-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22605.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
51+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22619.2</MicrosoftNETCoreAppRefPackageVersion>
52+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22619.2</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
53+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22619.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
5454
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
55-
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22605.1</MicrosoftExtensionsDependencyModelPackageVersion>
56-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22605.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
57-
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22605.1</MicrosoftNETHostModelVersion>
55+
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-alpha.1.22619.2</MicrosoftExtensionsDependencyModelPackageVersion>
56+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22619.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
57+
<MicrosoftNETHostModelVersion>8.0.0-alpha.1.22619.2</MicrosoftNETHostModelVersion>
5858
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
5959
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
6060
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
@@ -90,9 +90,9 @@
9090
</PropertyGroup>
9191
<PropertyGroup>
9292
<!-- Dependencies from https://github.com/dotnet/runtime -->
93-
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22605.1</SystemCodeDomPackageVersion>
94-
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22605.1</SystemTextEncodingCodePagesPackageVersion>
95-
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22605.1</SystemResourcesExtensionsPackageVersion>
93+
<SystemCodeDomPackageVersion>8.0.0-alpha.1.22619.2</SystemCodeDomPackageVersion>
94+
<SystemTextEncodingCodePagesPackageVersion>8.0.0-alpha.1.22619.2</SystemTextEncodingCodePagesPackageVersion>
95+
<SystemResourcesExtensionsPackageVersion>8.0.0-alpha.1.22619.2</SystemResourcesExtensionsPackageVersion>
9696
</PropertyGroup>
9797
<PropertyGroup>
9898
<!-- Dependencies from https://github.com/dotnet/format -->

‎eng/build.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,9 @@ jobs:
256256
BuildConfig: $(_BuildConfig)
257257
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
258258
HelixAccessToken: ${{ parameters.HelixAccessToken }}
259-
- script: $(Build.SourcesDirectory)/artifacts/bin/redist/$(_BuildConfig)/dotnet/dotnet workload install wasm-tools --skip-manifest-update
259+
- script: $(Build.SourcesDirectory)/artifacts/bin/redist/$(_BuildConfig)/dotnet/dotnet workload install wasm-tools
260+
# FIXME: add `--skip-manifest-update` back once the problem in
261+
# https://github.com/dotnet/sdk/pull/29406#issuecomment-1341643680 has been resolved.
260262
displayName: Install wasm-tools Workload
261263
continueOnError: false
262264
- powershell: $(Build.SourcesDirectory)/eng/common/build.ps1
@@ -288,7 +290,9 @@ jobs:
288290
displayName: Build
289291
env:
290292
BuildConfig: $(_BuildConfig)
291-
- script: $(Build.SourcesDirectory)/artifacts/bin/redist/$(_BuildConfig)/dotnet/dotnet workload install wasm-tools --skip-manifest-update
293+
- script: $(Build.SourcesDirectory)/artifacts/bin/redist/$(_BuildConfig)/dotnet/dotnet workload install wasm-tools
294+
# FIXME: add `--skip-manifest-update` back once the problem in
295+
# https://github.com/dotnet/sdk/pull/29406#issuecomment-1341643680 has been resolved.
292296
displayName: Install wasm-tools Workload
293297
continueOnError: false
294298
- script: eng/common/build.sh

‎src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private DirectoryInfo GetPublishDirectory(PublishCommand publishCommand, string
9292
runtimeIdentifier: RuntimeInformation.RuntimeIdentifier);
9393
}
9494

95-
[Fact]
95+
[Fact(Skip = "https://github.com/dotnet/sdk/issues/29602")]
9696
public void Incremental_add_single_file()
9797
{
9898
var testProject = new TestProject()
@@ -678,9 +678,10 @@ static void ProduceLinkerAnalysisWarning()
678678
[InlineData(ToolsetInfo.CurrentTargetFramework, false, IncludeDefault)]
679679
[InlineData(ToolsetInfo.CurrentTargetFramework, false, IncludeNative)]
680680
[InlineData(ToolsetInfo.CurrentTargetFramework, false, IncludeAllContent)]
681-
[InlineData(ToolsetInfo.CurrentTargetFramework, true, IncludeDefault)]
682-
[InlineData(ToolsetInfo.CurrentTargetFramework, true, IncludeNative)]
683-
[InlineData(ToolsetInfo.CurrentTargetFramework, true, IncludeAllContent)]
681+
// https://github.com/dotnet/sdk/issues/29602
682+
//[InlineData(ToolsetInfo.CurrentTargetFramework, true, IncludeDefault)]
683+
//[InlineData(ToolsetInfo.CurrentTargetFramework, true, IncludeNative)]
684+
//[InlineData(ToolsetInfo.CurrentTargetFramework, true, IncludeAllContent)]
684685
public void It_runs_single_file_apps(string targetFramework, bool selfContained, string bundleOption)
685686
{
686687
var testProject = new TestProject()
@@ -841,7 +842,7 @@ public void It_does_not_compress_single_file_by_default()
841842
uncompressedSize.Should().Be(compressedSize);
842843
}
843844

844-
[RequiresMSBuildVersionFact("17.0.0.32901")]
845+
[Fact(Skip = "https://github.com/dotnet/sdk/issues/29602")]
845846
public void User_can_get_bundle_info_before_bundling()
846847
{
847848
var testProject = new TestProject()

0 commit comments

Comments
 (0)
Please sign in to comment.