diff --git a/Directory.Build.props b/Directory.Build.props
index 6bcde550752..f62de93b7ce 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -53,6 +53,9 @@
$(NoWarn.Replace(';1591', ''))
+
+ $(NoWarn);NU5104
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 79aca169d64..62d848091c9 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -6,23 +6,23 @@ This file should be imported by eng/Versions.props
- 12.0.0-beta.26480.102
- 12.0.0-beta.26480.102
- 12.0.0-beta.26480.102
- 12.0.0-alpha.1.26480.102
- 12.0.0-alpha.1.26480.102
- 12.0.0-alpha.1.26480.102
- 12.0.0-alpha.1.26480.102
- 12.0.0-alpha.1.26480.102
- 12.0.0-alpha.1.26480.102
- 12.0.0-alpha.1.26480.102
- 12.0.0-alpha.1.26480.102
- 12.0.0-alpha.1.26480.102
- 12.0.0-alpha.1.26480.102
- 12.0.0-alpha.1.26480.102
- 12.0.0-alpha.1.26480.102
- 12.0.0-alpha.1.26480.102
- 12.0.0-alpha.1.26480.102
+ 12.0.0-beta.26521.103
+ 12.0.0-beta.26521.103
+ 12.0.0-beta.26521.103
+ 12.0.0-alpha.1.26521.103
+ 12.0.0-alpha.1.26521.103
+ 12.0.0-alpha.1.26521.103
+ 12.0.0-alpha.1.26521.103
+ 12.0.0-alpha.1.26521.103
+ 12.0.0-alpha.1.26521.103
+ 12.0.0-alpha.1.26521.103
+ 12.0.0-alpha.1.26521.103
+ 12.0.0-alpha.1.26521.103
+ 12.0.0-alpha.1.26521.103
+ 12.0.0-alpha.1.26521.103
+ 12.0.0-alpha.1.26521.103
+ 12.0.0-alpha.1.26521.103
+ 12.0.0-alpha.1.26521.103
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7bab9771fa4..218e1364fc5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,76 +1,76 @@
-
+
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
-
+
https://github.com/dotnet/dotnet
- a2f466a2ccc2851d3c665f764a36b0cb59dd18b8
+ ee344f85ef890dd92974e9b93d75906f1f8c39f3
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 305132a6d6d..64c5ed10263 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -181,10 +181,6 @@ try {
if (-not $PSBoundParameters.ContainsKey('nodeReuse')) {
$nodeReuse = $false
}
- # MSBuild's multi-threaded mode isn't run on CI unless it was explicitly requested via -msbuildMultiThreaded.
- if (-not $PSBoundParameters.ContainsKey('msbuildMultiThreaded')) {
- $msbuildMultiThreaded = $false
- }
}
if (-not [string]::IsNullOrEmpty($binaryLogName)) {
diff --git a/eng/common/core-templates/steps/astred-artifacts.yml b/eng/common/core-templates/steps/astred-artifacts.yml
index ab01349d540..86420925b44 100644
--- a/eng/common/core-templates/steps/astred-artifacts.yml
+++ b/eng/common/core-templates/steps/astred-artifacts.yml
@@ -47,7 +47,6 @@ steps:
env:
ASTRED_BINLOG_DIR: ${{ parameters.binlogDir }}
ASTRED_CAPTURE_PATH: ${{ parameters.capturePath }}
- condition: succeededOrFailed()
continueOnError: true
- pwsh: |
@@ -94,12 +93,12 @@ steps:
env:
ASTRED_SOURCES_PATH: ${{ parameters.sourcesPath }}
ASTRED_CAPTURE_PATH: ${{ parameters.capturePath }}
- condition: succeededOrFailed()
continueOnError: true
- task: UploadAstred@0
displayName: Upload Digest to Astred
- condition: and(succeededOrFailed(), eq(variables['ASTRED_DIGEST_READY'], 'true'))
+ condition: and(succeeded(), eq(variables['ASTRED_DIGEST_READY'], 'true'))
+ continueOnError: true
inputs:
SourcePath: ${{ parameters.capturePath }}/upload
env:
diff --git a/eng/common/cross/install-debs.py b/eng/common/cross/install-debs.py
index 1d1dfabf7dc..e2d5ef4030a 100755
--- a/eng/common/cross/install-debs.py
+++ b/eng/common/cross/install-debs.py
@@ -36,6 +36,8 @@ async def download_file(session, url, dest_path, max_retries=3, retry_delay=2, t
f.write(content)
print(f"Downloaded {url} at {dest_path}")
return
+ elif response.status >= 500 or response.status in (408, 429):
+ response.raise_for_status()
else:
raise Exception(f"Failed to download {url}, Status Code: {response.status}")
except (asyncio.CancelledError, asyncio.TimeoutError, aiohttp.ClientError) as e:
diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1
index 8076945064d..161f8e8077c 100644
--- a/eng/common/msbuild.ps1
+++ b/eng/common/msbuild.ps1
@@ -19,11 +19,6 @@ try {
$nodeReuse = $false
}
- # MSBuild's multi-threaded mode isn't run on CI unless it was explicitly requested via -msbuildMultiThreaded.
- if ($ci -and -not $PSBoundParameters.ContainsKey('msbuildMultiThreaded')) {
- $msbuildMultiThreaded = $false
- }
-
MSBuild @extraArgs
}
catch {
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index cea14279b85..9cb84a8a941 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -31,8 +31,9 @@
# Set to true to reuse msbuild nodes. Recommended to not reuse on CI.
[bool]$nodeReuse = if (Test-Path variable:nodeReuse) { $nodeReuse } else { !$ci }
-# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for local builds and not run on CI.
-[bool]$msbuildMultiThreaded = if (Test-Path variable:msbuildMultiThreaded) { $msbuildMultiThreaded } else { !$ci }
+# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for both local and CI builds.
+# Not applied when building with msbuild.exe (VS MSBuild).
+[bool]$msbuildMultiThreaded = if (Test-Path variable:msbuildMultiThreaded) { $msbuildMultiThreaded } else { $true }
# Configures warning treatment in msbuild.
[bool]$warnAsError = if (Test-Path variable:warnAsError) { $warnAsError } else { $true }
@@ -812,8 +813,9 @@ function MSBuild() {
$cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"
- # Build with MSBuild's multi-threaded mode.
- if ($msbuildMultiThreaded) {
+ # Build with MSBuild's multi-threaded mode, but not with msbuild.exe (VS MSBuild) for now.
+ # TODO: Enable for VS MSBuild as well: https://github.com/dotnet/dotnet/issues/9989
+ if ($msbuildMultiThreaded -and [System.IO.Path]::GetFileName($buildTool.Path) -ne 'msbuild.exe') {
$cmdArgs += ' -mt'
}
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index fdbc19243f1..3b4a5ac5142 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -60,13 +60,9 @@ else
node_reuse=${node_reuse:-true}
fi
-# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for local builds and not run on CI.
+# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for both local and CI builds.
msbuild_multi_threaded=$(NormalizeBoolArg "${msbuild_multi_threaded:-}")
-if [[ "$ci" == true ]]; then
- msbuild_multi_threaded=${msbuild_multi_threaded:-false}
-else
- msbuild_multi_threaded=${msbuild_multi_threaded:-true}
-fi
+msbuild_multi_threaded=${msbuild_multi_threaded:-true}
# Configures warning treatment in msbuild.
warn_as_error=$(NormalizeBoolArg "${warn_as_error:-}")
diff --git a/global.json b/global.json
index a3b26baf9ea..da14b0e9183 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "11.0.100-rc.1.26425.128",
+ "version": "12.0.100-alpha.1.26480.102",
"allowPrerelease": true,
"rollForward": "latestMajor",
"paths": [
@@ -13,7 +13,7 @@
"runner": "Microsoft.Testing.Platform"
},
"tools": {
- "dotnet": "11.0.100-rc.1.26425.128",
+ "dotnet": "12.0.100-alpha.1.26480.102",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCorePlatformsVersion)"
@@ -24,8 +24,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26480.102",
- "Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26480.102",
+ "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26521.103",
+ "Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26521.103",
"Microsoft.Build.NoTargets": "3.7.134"
}
}
diff --git a/test/EFCore.Analyzers.Tests/TestUtilities/CSharpAnalyzerVerifier.cs b/test/EFCore.Analyzers.Tests/TestUtilities/CSharpAnalyzerVerifier.cs
index 9516c16a56d..02686d0408c 100644
--- a/test/EFCore.Analyzers.Tests/TestUtilities/CSharpAnalyzerVerifier.cs
+++ b/test/EFCore.Analyzers.Tests/TestUtilities/CSharpAnalyzerVerifier.cs
@@ -28,11 +28,8 @@ public class Test : CSharpAnalyzerTest
{
public Test()
{
-#if NET11_0
- // Microsoft.CodeAnalysis.Testing currently does not have built-in support for .NET 11.0.
- // ReferenceAssemblies = ReferenceAssemblies.Net.Net110;
-
- ReferenceAssemblies = ReferenceAssembliesNet110;
+#if NET12_0
+ ReferenceAssemblies = ReferenceAssembliesNet120;
#else
#error Update the above to match the targeted TFM
#endif
@@ -57,6 +54,6 @@ public Test()
protected override CompilationOptions CreateCompilationOptions()
=> ((CSharpCompilationOptions)base.CreateCompilationOptions()).WithNullableContextOptions(NullableContextOptions.Enable);
- private static readonly ReferenceAssemblies ReferenceAssembliesNet110 = new("net11.0");
+ private static readonly ReferenceAssemblies ReferenceAssembliesNet120 = new("net12.0");
}
}
diff --git a/test/EFCore.Analyzers.Tests/TestUtilities/CSharpCodeFixVerifier.cs b/test/EFCore.Analyzers.Tests/TestUtilities/CSharpCodeFixVerifier.cs
index 9bd8887d497..9993135c78d 100644
--- a/test/EFCore.Analyzers.Tests/TestUtilities/CSharpCodeFixVerifier.cs
+++ b/test/EFCore.Analyzers.Tests/TestUtilities/CSharpCodeFixVerifier.cs
@@ -37,11 +37,8 @@ public class Test : CSharpCodeFixTest
{
public Test()
{
-#if NET11_0
- // Microsoft.CodeAnalysis.Testing currently does not have built-in support for .NET 11.0.
- // ReferenceAssemblies = ReferenceAssemblies.Net.Net110;
-
- ReferenceAssemblies = ReferenceAssembliesNet110;
+#if NET12_0
+ ReferenceAssemblies = ReferenceAssembliesNet120;
#else
#error Update the above to match the targeted TFM
#endif
@@ -66,6 +63,6 @@ public Test()
protected override CompilationOptions CreateCompilationOptions()
=> ((CSharpCompilationOptions)base.CreateCompilationOptions()).WithNullableContextOptions(NullableContextOptions.Enable);
- private static readonly ReferenceAssemblies ReferenceAssembliesNet110 = new("net11.0");
+ private static readonly ReferenceAssemblies ReferenceAssembliesNet120 = new("net12.0");
}
}