diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index a97bb95ae13c..e4908f48b552 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -64,6 +64,9 @@ extends:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022
os: windows
+ containers:
+ sourceBuildManagedContainer:
+ image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
stages:
- stage: build
displayName: Build
@@ -120,7 +123,7 @@ extends:
enableInternalSources: true
platform:
name: 'Managed'
- container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
+ container: sourceBuildManagedContainer
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/build.yml@self
parameters:
diff --git a/NuGet.config b/NuGet.config
index 59e28da89c25..60dbe4113340 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -3,11 +3,13 @@
+
+
@@ -15,11 +17,13 @@
+
+
@@ -44,6 +48,7 @@
+
@@ -51,8 +56,10 @@
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 94e58efffbea..ab266dc2152a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -14,46 +14,46 @@
c60b810b74b2e1dad8159cd33363483c07195f41
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- a2266c728f63a494ccb6786d794da2df135030be
+ c96cd11cb2f0c204f272b2280082a329aee24cf7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- a2266c728f63a494ccb6786d794da2df135030be
+ c96cd11cb2f0c204f272b2280082a329aee24cf7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- a2266c728f63a494ccb6786d794da2df135030be
+ c96cd11cb2f0c204f272b2280082a329aee24cf7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- a2266c728f63a494ccb6786d794da2df135030be
+ c96cd11cb2f0c204f272b2280082a329aee24cf7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- a2266c728f63a494ccb6786d794da2df135030be
+ c96cd11cb2f0c204f272b2280082a329aee24cf7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- a2266c728f63a494ccb6786d794da2df135030be
+ c96cd11cb2f0c204f272b2280082a329aee24cf7
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- a2266c728f63a494ccb6786d794da2df135030be
+ c96cd11cb2f0c204f272b2280082a329aee24cf7
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
81cabf2857a01351e5ab578947c7403a5b128ad1
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- a2266c728f63a494ccb6786d794da2df135030be
+ c96cd11cb2f0c204f272b2280082a329aee24cf7
-
+
https://github.com/dotnet/emsdk
- 9e37ff5ebf5f464d80bdae6ad9d24e7a01ee11f8
+ 87f89d77d2eb70ed29b3e0f37cfbf28bfd49c536
https://github.com/dotnet/msbuild
@@ -111,13 +111,13 @@
https://github.com/dotnet/roslyn
38896ab4e7cee896fcde8a4e26914a777c794e3b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
@@ -200,9 +200,9 @@
https://github.com/microsoft/vstest
aa59400b11e1aeee2e8af48928dbd48748a8bef9
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- a2266c728f63a494ccb6786d794da2df135030be
+ c96cd11cb2f0c204f272b2280082a329aee24cf7
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -228,70 +228,70 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
5535e31a712343a63f5d7d796cd874e563e5ac14
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7
+ 0167058c735054c0f948ca3925c693a958875427
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7
+ 0167058c735054c0f948ca3925c693a958875427
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7
+ 0167058c735054c0f948ca3925c693a958875427
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7
+ 0167058c735054c0f948ca3925c693a958875427
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- 925e025a1ad14f0b6f094e5b2d5cc9f62ada294c
+ b132b33a48ebc857db94785fdd86d671d123911a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
https://github.com/dotnet/razor
@@ -306,21 +306,21 @@
https://github.com/dotnet/razor
a36694712be3000f238f25e52f11e6225dda5f9b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
https://github.com/dotnet/xdt
@@ -437,9 +437,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
5535e31a712343a63f5d7d796cd874e563e5ac14
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- ee417479933278bb5aadc5944706a96b5ef74a5d
+ 568fff703254def7dcd35fda9892bf702d4c81d3
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
diff --git a/eng/Versions.props b/eng/Versions.props
index 1b62ad7f049c..ec342f208fdb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -49,21 +49,21 @@
- 8.0.22
- 8.0.22-servicing.25527.7
- 8.0.22
+ 8.0.23
+ 8.0.23-servicing.25606.7
+ 8.0.23
$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)
8.0.2
- 8.0.22
- 8.0.22-servicing.25527.7
+ 8.0.23
+ 8.0.23-servicing.25606.7
8.0.0
8.0.1
8.0.3
8.0.1
- 8.0.22
+ 8.0.23
8.0.0
8.0.0
- 8.0.22
+ 8.0.23
8.0.0
8.0.0
8.0.0
@@ -170,13 +170,13 @@
- 8.0.22
- 8.0.22-servicing.25528.8
- 8.0.22-servicing.25528.8
- 8.0.22-servicing.25528.8
- 8.0.22-servicing.25528.8
- 8.0.22-servicing.25528.8
- 8.0.22
+ 8.0.23
+ 8.0.23-servicing.25609.5
+ 8.0.23-servicing.25609.5
+ 8.0.23-servicing.25609.5
+ 8.0.23-servicing.25609.5
+ 8.0.23-servicing.25609.5
+ 8.0.23
@@ -186,7 +186,7 @@
- 8.0.22-servicing.25528.2
+ 8.0.23-servicing.25609.4
@@ -230,7 +230,7 @@
- 8.0.22
+ 8.0.23
$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion)
8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))
diff --git a/src/Tests/Microsoft.NET.Build.Tests/WorkloadTests.cs b/src/Tests/Microsoft.NET.Build.Tests/WorkloadTests.cs
index aa93bbfd6667..b4f588b76aef 100644
--- a/src/Tests/Microsoft.NET.Build.Tests/WorkloadTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Tests/WorkloadTests.cs
@@ -11,7 +11,8 @@ public WorkloadTests(ITestOutputHelper log) : base(log)
{
}
- [Fact]
+ // Changing these tests to core MSBuild only for 8.0 since there were weird test failures and the Full Framework resolver doesn't ship from 8.0 into Visual Studio anymore.
+ [CoreMSBuildOnlyFact]
public void It_should_build_with_workload()
{
var testProject = new TestProject()
@@ -29,7 +30,7 @@ public void It_should_build_with_workload()
.Pass();
}
- [Fact]
+ [CoreMSBuildOnlyFact]
public void It_should_fail_without_workload()
{
var testProject = new TestProject()
@@ -49,7 +50,7 @@ public void It_should_fail_without_workload()
.HaveStdOutContaining("NETSDK1147");
}
- [Fact]
+ [CoreMSBuildOnlyFact]
public void It_should_create_suggested_workload_items()
{
var testProject = new TestProject()
@@ -80,7 +81,7 @@ public void It_should_create_suggested_workload_items()
.BeEquivalentTo(new[] { ("microsoft-net-sdk-missingtestworkload", "microsoft.net.sdk.missingtestworkload") });
}
- [Fact]
+ [CoreMSBuildOnlyFact]
public void It_should_fail_to_restore_without_workload_when_multitargeted()
{
var testProject = new TestProject()
@@ -107,7 +108,7 @@ public void It_should_fail_to_restore_without_workload_when_multitargeted()
// .HaveStdOutContaining("android");
}
- [Fact(Skip = "https://github.com/dotnet/sdk/issues/19866")]
+ [CoreMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/19866")]
public void It_should_fail_to_build_without_workload_when_multitargeted()
{
var testProject = new TestProject()
@@ -129,7 +130,7 @@ public void It_should_fail_to_build_without_workload_when_multitargeted()
.HaveStdOutContaining("android");
}
- [Fact]
+ [CoreMSBuildOnlyFact]
public void It_should_fail_to_build_when_multitargeted_to_unknown_platforms()
{
var testProject = new TestProject()
@@ -150,7 +151,7 @@ public void It_should_fail_to_build_when_multitargeted_to_unknown_platforms()
}
- [Fact]
+ [CoreMSBuildOnlyFact]
public void It_should_fail_with_resolver_disabled()
{
var testProject = new TestProject()
@@ -172,7 +173,7 @@ public void It_should_fail_with_resolver_disabled()
.HaveStdOutContaining("NETSDK1208");
}
- [Fact]
+ [CoreMSBuildOnlyFact]
public void It_should_import_AutoImports_for_installed_workloads()
{
var testProject = new TestProject()
@@ -198,7 +199,7 @@ public void It_should_import_AutoImports_for_installed_workloads()
.BeEquivalentTo("true");
}
- [Fact]
+ [CoreMSBuildOnlyFact]
public void It_should_import_aliased_pack()
{
var testProject = new TestProject()
@@ -227,7 +228,7 @@ public void It_should_import_aliased_pack()
.BeEquivalentTo("true");
}
- [Fact(Skip = "https://github.com/dotnet/sdk/issues/19866")]
+ [CoreMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/19866")]
public void It_should_get_suggested_workload_by_GetRequiredWorkloads_target()
{
var mainProject = new TestProject()
@@ -255,7 +256,7 @@ public void It_should_get_suggested_workload_by_GetRequiredWorkloads_target()
.BeEquivalentTo("android");
}
- [Theory(Skip = "https://github.com/dotnet/installer/issues/13361")]
+ [CoreMSBuildOnlyTheory(Skip = "https://github.com/dotnet/installer/issues/13361")]
[InlineData($"{ToolsetInfo.CurrentTargetFramework}-android;{ToolsetInfo.CurrentTargetFramework}-ios", $"{ToolsetInfo.CurrentTargetFramework}-android;{ToolsetInfo.CurrentTargetFramework}-ios", "android;android-aot")]
[InlineData(ToolsetInfo.CurrentTargetFramework, $"{ToolsetInfo.CurrentTargetFramework};{ToolsetInfo.CurrentTargetFramework}-android;{ToolsetInfo.CurrentTargetFramework}-ios", "macos;android-aot")]
[InlineData($"{ToolsetInfo.CurrentTargetFramework};{ToolsetInfo.CurrentTargetFramework}-ios", $"{ToolsetInfo.CurrentTargetFramework};{ToolsetInfo.CurrentTargetFramework}-android", "macos;android-aot")]