diff --git a/NuGet.config b/NuGet.config index b24702052c1..cd98ffb98b9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,8 @@ <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-runtime --> <add key="darc-int-dotnet-runtime-c8acea2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22/nuget/v3/index.json" /> + <add key="darc-int-dotnet-runtime-c8acea2-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22-8/nuget/v3/index.json" /> + <add key="darc-int-dotnet-runtime-c8acea2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22-3/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" /> @@ -21,6 +23,8 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-runtime --> + <add key="darc-int-dotnet-runtime-c8acea2-3" value="true" /> + <add key="darc-int-dotnet-runtime-c8acea2-8" value="true" /> <add key="darc-int-dotnet-runtime-c8acea2" value="true" /> <!-- End: Package sources from dotnet-runtime --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c07270a697f..e9e5456d8ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25058.5"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25065.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha> + <Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25058.5"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25065.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha> + <Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25058.5"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25065.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>8cc6ecd76c24ef6665579a5c5e386a211a1e7c54</Sha> + <Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index 080cc9bd776..59c15bc078e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ <SystemFormatsAsn1Version>9.0.1</SystemFormatsAsn1Version> </PropertyGroup> <PropertyGroup Label="Dependencies from dotnet/arcade"> - <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksTemplatingVersion> + <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25065.2</MicrosoftDotNetBuildTasksTemplatingVersion> </PropertyGroup> <PropertyGroup Label="Other dependencies"> <MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion> diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 5ef6c30ba92..98bbc1ded0b 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -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 724b88e9ed9..de3eeb86e5a 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "9.0.100", + "version": "9.0.102", "allowPrerelease": true, "rollForward": "latestMajor" }, "tools": { - "dotnet": "9.0.100", + "dotnet": "9.0.102", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25058.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25065.2" } }