diff --git a/NuGet.config b/NuGet.config index 0d112603fdb..27663157bac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e0336b7de34..bf7bf773646 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25563.104 - 10.0.0-beta.25563.104 - 10.0.0-beta.25563.104 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1-servicing.25563.104 - 10.0.1 - 10.0.1 - 10.0.1-servicing.25563.104 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 + 10.0.0-beta.25570.103 + 10.0.0-beta.25570.103 + 10.0.0-beta.25570.103 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25570.103 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25570.103 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e71616bb1ac..c8fbef194c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 18f6e60aa4755c2be56b2d45165a135d64d4f710 diff --git a/eng/Versions.props b/eng/Versions.props index 8410d3369cc..7425232448a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 10.0.1 + 10.0.2 servicing False diff --git a/eng/common/cross/arm/sources.list.focal b/eng/common/cross/arm/sources.list.focal deleted file mode 100644 index 4de2600c174..00000000000 --- a/eng/common/cross/arm/sources.list.focal +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse diff --git a/eng/common/cross/arm/sources.list.jammy b/eng/common/cross/arm/sources.list.jammy deleted file mode 100644 index 6bb0453029c..00000000000 --- a/eng/common/cross/arm/sources.list.jammy +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.focal b/eng/common/cross/arm64/sources.list.focal deleted file mode 100644 index 4de2600c174..00000000000 --- a/eng/common/cross/arm64/sources.list.focal +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.jammy b/eng/common/cross/arm64/sources.list.jammy deleted file mode 100644 index 6bb0453029c..00000000000 --- a/eng/common/cross/arm64/sources.list.jammy +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse diff --git a/eng/common/cross/x64/sources.list.bionic b/eng/common/cross/x64/sources.list.bionic deleted file mode 100644 index a71ccadcffa..00000000000 --- a/eng/common/cross/x64/sources.list.bionic +++ /dev/null @@ -1,11 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted -deb-src http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted - -deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse diff --git a/eng/common/cross/x64/sources.list.xenial b/eng/common/cross/x64/sources.list.xenial deleted file mode 100644 index ad9c5a0144e..00000000000 --- a/eng/common/cross/x64/sources.list.xenial +++ /dev/null @@ -1,11 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu/ xenial main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ xenial main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted -deb-src http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted - -deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse diff --git a/eng/common/cross/x86/sources.list.focal b/eng/common/cross/x86/sources.list.focal deleted file mode 100644 index 99d5731330e..00000000000 --- a/eng/common/cross/x86/sources.list.focal +++ /dev/null @@ -1,11 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted -deb-src http://archive.ubuntu.com/ubuntu/ focal-backports main restricted - -deb http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse diff --git a/eng/common/cross/x86/sources.list.jammy b/eng/common/cross/x86/sources.list.jammy deleted file mode 100644 index af1c1feaeac..00000000000 --- a/eng/common/cross/x86/sources.list.jammy +++ /dev/null @@ -1,11 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe -deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe - -deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted -deb-src http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted - -deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ef8cf549113..53ede714bdd 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -5,4 +5,4 @@ stages: is1ESPipeline: false ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/global.json b/global.json index c1bbda751a6..dafafb02c05 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.2.25502.107", + "version": "10.0.100", "allowPrerelease": true, "rollForward": "latestMajor", "paths": [ @@ -10,7 +10,7 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./restore.sh or .\\restore.cmd to install it." }, "tools": { - "dotnet": "10.0.100-rc.2.25502.107", + "dotnet": "10.0.100", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsVersion)" @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25563.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25563.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25570.103", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25570.103" } }