diff --git a/NuGet.config b/NuGet.config index c3fbc44e188f..9ce3a61f279d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,11 +6,15 @@ + + + + @@ -19,7 +23,11 @@ + + + + @@ -41,11 +49,11 @@ + + - - - + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 81d6fd136e09..2622db83de85 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -15,6 +15,11 @@ + + + + + diff --git a/src/SourceBuild/content/.devcontainer/devcontainer.json b/src/SourceBuild/content/.devcontainer/devcontainer.json index 6061a0eff8c6..d4eee4a9f733 100644 --- a/src/SourceBuild/content/.devcontainer/devcontainer.json +++ b/src/SourceBuild/content/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ // Container contains checked-out source code only { "name": "Default", - "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36", + "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41", "hostRequirements": { // A completely source built .NET is >64 GB with all the repos/artifacts "storage": "128gb" diff --git a/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json b/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json index eaff85ffda5a..17df3bf733eb 100644 --- a/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json +++ b/src/SourceBuild/content/.devcontainer/prebuilt-sdk/devcontainer.json @@ -1,7 +1,7 @@ // Container contains a pre-built SDK { "name": "Pre-built .NET SDK", - "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36", + "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41", "hostRequirements": { // A completely source built .NET is >64 GB with all the repos/artifacts "storage": "128gb" diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index c6809928d082..d4ae30324171 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -30,7 +30,7 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.110-servicing.24474.1.centos.9-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.110-centos.9-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.111-servicing.24523.1.centos.9-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.111-centos.9-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 9c9f81df396a..37826e27f6bd 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,12 +1,12 @@ { "tools": { - "dotnet": "8.0.110" + "dotnet": "8.0.111" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", "Microsoft.Build.Traversal": "2.0.2", "Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24463.3", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1", "Yarn.MSBuild": "1.15.2" } }