diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index f1cc222520..5e29c66131 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -21,4 +21,4 @@
]
}
}
-}
\ No newline at end of file
+}
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ba7309e92b..33dc0a3103 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -125,42 +125,42 @@
-
+
https://github.com/dotnet/arcade
- dd332f2d4e21daa8b79f84251ab156af9a0b11b2
+ 04b9022eba9c184a8036328af513c22e6949e8b6
-
+
https://github.com/dotnet/arcade
- dd332f2d4e21daa8b79f84251ab156af9a0b11b2
+ 04b9022eba9c184a8036328af513c22e6949e8b6
-
+
https://github.com/dotnet/arcade
- dd332f2d4e21daa8b79f84251ab156af9a0b11b2
+ 04b9022eba9c184a8036328af513c22e6949e8b6
-
+
https://github.com/dotnet/arcade
- dd332f2d4e21daa8b79f84251ab156af9a0b11b2
+ 04b9022eba9c184a8036328af513c22e6949e8b6
-
+
https://github.com/dotnet/arcade
- dd332f2d4e21daa8b79f84251ab156af9a0b11b2
+ 04b9022eba9c184a8036328af513c22e6949e8b6
-
+
https://github.com/dotnet/arcade
- dd332f2d4e21daa8b79f84251ab156af9a0b11b2
+ 04b9022eba9c184a8036328af513c22e6949e8b6
-
+
https://github.com/dotnet/arcade
- dd332f2d4e21daa8b79f84251ab156af9a0b11b2
+ 04b9022eba9c184a8036328af513c22e6949e8b6
-
+
https://github.com/dotnet/arcade
- dd332f2d4e21daa8b79f84251ab156af9a0b11b2
+ 04b9022eba9c184a8036328af513c22e6949e8b6
-
+
https://github.com/dotnet/arcade
- dd332f2d4e21daa8b79f84251ab156af9a0b11b2
+ 04b9022eba9c184a8036328af513c22e6949e8b6
diff --git a/eng/Versions.props b/eng/Versions.props
index ae20030a1e..0b5696930a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -34,10 +34,10 @@
0.7.2
0.7.2
- 9.0.0-beta.24453.1
- 9.0.0-beta.24453.1
- 9.0.0-beta.24453.1
- 9.0.0-beta.24453.1
+ 9.0.0-beta.24466.2
+ 9.0.0-beta.24466.2
+ 9.0.0-beta.24466.2
+ 9.0.0-beta.24466.2
8.9.1
8.9.1
8.0.0
diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md
index 0a8ddf3477..5ef6c30ba9 100644
--- a/eng/common/template-guidance.md
+++ b/eng/common/template-guidance.md
@@ -12,7 +12,7 @@ Basic guidance is:
See [azure-pipelines.yml](../../azure-pipelines.yml) (templates-official example) or [azure-pipelines-pr.yml](../../azure-pipelines-pr.yml) (templates example) for examples.
-### The `templateIs1ESManaged` parameter
+#### The `templateIs1ESManaged` parameter
The `templateIs1ESManaged` is available on most templates and affects which of the variants is used for nested templates. See [Development Notes](#development-notes) below for more information on the `templateIs1ESManaged1 parameter.
@@ -57,7 +57,7 @@ extends:
Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`).
-## Development notes
+# Development notes
**Folder / file structure**
diff --git a/global.json b/global.json
index 002d2ce185..3ddf2b42e0 100644
--- a/global.json
+++ b/global.json
@@ -1,11 +1,11 @@
{
"sdk": {
- "version": "9.0.100-preview.7.24407.12",
+ "version": "9.0.100-rc.1.24452.12",
"rollForward": "major",
"allowPrerelease": true
},
"tools": {
- "dotnet": "9.0.100-preview.7.24407.12",
+ "dotnet": "9.0.100-rc.1.24452.12",
"runtimes": {
"dotnet/x64": [
"$(DotNetRuntimeVersionForTesting)"
@@ -22,9 +22,9 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24453.1",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24453.1",
- "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24453.1",
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24466.2",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24466.2",
+ "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24466.2",
"Microsoft.Build.NoTargets": "3.7.0"
}
}
diff --git a/tests/Shared/WorkloadTesting/BuildEnvironment.cs b/tests/Shared/WorkloadTesting/BuildEnvironment.cs
index bf72dea537..139673e0a3 100644
--- a/tests/Shared/WorkloadTesting/BuildEnvironment.cs
+++ b/tests/Shared/WorkloadTesting/BuildEnvironment.cs
@@ -127,6 +127,10 @@ public BuildEnvironment(bool useSystemDotNet = false, TestTargetFramework target
// Set DEBUG_SESSION_PORT='' to avoid the app from the tests connecting
// to the IDE
EnvVars["DEBUG_SESSION_PORT"] = "";
+ // Avoid using the msbuild terminal logger, so the output can be read
+ // in the tests
+ EnvVars["VsTestUseMSBuildOutput"] = "false";
+ EnvVars["MSBUILDENSURESTDOUTFORTASKPROCESSES"] = "1";
DotNet = Path.Combine(sdkForWorkloadPath!, "dotnet");
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))