diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index eb2acb8c9..266784afc 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -334,10 +334,11 @@ stages:
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
- - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
- - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
- parameters:
- dependsOn: Source_Build_Create_Tarball
+ # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches.
+ # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
+ # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
+ # parameters:
+ # dependsOn: Source_Build_Create_Tarball
# https://github.com/dotnet/core-sdk/issues/248
# - template: /eng/build.yml
diff --git a/NuGet.config b/NuGet.config
index 3d6b197f7..0148533a5 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,14 +7,19 @@
+
+
+
+
+
@@ -36,11 +41,15 @@
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 76a6cf0f0..8bbe10d4e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,46 +1,46 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 417429fc040af552532bb07aad29e5e8639b840f
+ 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 417429fc040af552532bb07aad29e5e8639b840f
+ 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 417429fc040af552532bb07aad29e5e8639b840f
+ 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 417429fc040af552532bb07aad29e5e8639b840f
+ 0b5ccf8ce4c1dcf0cbd2869067efa3ba26203015
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a2bda10e81d901396c3cff95533529e3a93ad47
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a2bda10e81d901396c3cff95533529e3a93ad47
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a2bda10e81d901396c3cff95533529e3a93ad47
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a2bda10e81d901396c3cff95533529e3a93ad47
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a2bda10e81d901396c3cff95533529e3a93ad47
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a2bda10e81d901396c3cff95533529e3a93ad47
@@ -52,34 +52,34 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- bb01bbf4433e27289b99001b7de6a582879d1835
+ e2a3f564fa6d9db4bc83893337c87c225ba6a5de
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- bb01bbf4433e27289b99001b7de6a582879d1835
+ e2a3f564fa6d9db4bc83893337c87c225ba6a5de
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- bb01bbf4433e27289b99001b7de6a582879d1835
+ e2a3f564fa6d9db4bc83893337c87c225ba6a5de
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- bb01bbf4433e27289b99001b7de6a582879d1835
+ e2a3f564fa6d9db4bc83893337c87c225ba6a5de
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- bb01bbf4433e27289b99001b7de6a582879d1835
+ e2a3f564fa6d9db4bc83893337c87c225ba6a5de
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- bb01bbf4433e27289b99001b7de6a582879d1835
+ e2a3f564fa6d9db4bc83893337c87c225ba6a5de
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- bb01bbf4433e27289b99001b7de6a582879d1835
+ e2a3f564fa6d9db4bc83893337c87c225ba6a5de
https://github.com/dotnet/test-templates
@@ -98,39 +98,39 @@
bb3695688177f5f80eeb3c0498168612e31549d5
-
- https://github.com/dotnet/sdk
- 3605277a9324189c35b0da271e10a2386d6f6d06
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
+ 91d3f08648bb0b76b5354ff737e1a3ade221cb4a
-
- https://github.com/dotnet/sdk
- 3605277a9324189c35b0da271e10a2386d6f6d06
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
+ 91d3f08648bb0b76b5354ff737e1a3ade221cb4a
-
- https://github.com/dotnet/sdk
- 3605277a9324189c35b0da271e10a2386d6f6d06
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
+ 91d3f08648bb0b76b5354ff737e1a3ade221cb4a
-
- https://github.com/dotnet/sdk
- 3605277a9324189c35b0da271e10a2386d6f6d06
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
+ 91d3f08648bb0b76b5354ff737e1a3ade221cb4a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- e83409daa530605da4eb5f847c6740a520325d25
+ 8b06c27c9b81f33e69f8d5155fe69693f661fa3d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- 636e2b7a00a434a354a126f510a56e16ce3c6bbc
+ 69a9b7a08dabcaa9ca39eb2ce4c6051d729ce899
-
+
https://github.com/dotnet/fsharp
- 1607c540c369f9ae32a48dd72e7952148b084a2a
+ e391694876e891d2cdc4089e62fe7b1138d8294e
-
+
https://github.com/dotnet/fsharp
- 1607c540c369f9ae32a48dd72e7952148b084a2a
+ e391694876e891d2cdc4089e62fe7b1138d8294e
@@ -138,20 +138,20 @@
be79eb4393631df7c6431ed1c0aa14c1bbaca731
-
+
https://github.com/dotnet/linker
- 8db10f44053ed4cb95a99676ac7b8ccae681b79d
+ 19fa656d35252ccf926e6a6d783b16a2f094aaef
linker
-
+
https://github.com/dotnet/roslyn
- 8ad2e6240cb7426d83f1b45241f8f33bddf3d474
+ 5964d1a8e82d7a6e27b3b31bc1d6e44d0a2127b4
-
+
https://github.com/dotnet/msbuild
- ab3d68e815ba13916d6d3a653445d71ad238c723
+ 040e2a90ee794997fc9716487280a54b0ad8fe2a
@@ -163,13 +163,13 @@
https://github.com/Microsoft/ApplicationInsights-dotnet
53b80940842204f78708a538628288ff5d741a1d
-
+
https://github.com/dotnet/emsdk
- 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31
+ 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb
-
+
https://github.com/dotnet/emsdk
- 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31
+ 67006e8fe3c3ba1a6e9282d116782fd4fea9dfcb
https://github.com/dotnet/deployment-tools
diff --git a/eng/Versions.props b/eng/Versions.props
index 8b3a57153..543ff5ef3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -31,11 +31,11 @@
- 7.0.0-rtm.22518.7
+ 7.0.2-servicing.22606.8
- 7.0.0-rtm.22518.2
+ 7.0.3-servicing.23061.11
@@ -50,22 +50,22 @@
- 7.0.0
- 7.0.0
- 7.0.0-rtm.22518.19
- 7.0.0-rtm.22518.19
- 7.0.0-rtm.22518.19
- 7.0.0-rtm.22518.19
- 7.0.0-rtm.22518.19
+ 7.0.3
+ 7.0.3
+ 7.0.3-servicing.23062.18
+ 7.0.3-servicing.23062.18
+ 7.0.3-servicing.23062.18
+ 7.0.3-servicing.23062.18
+ 7.0.3-servicing.23062.18
0.2.0
- 7.0.200-preview.23060.2
- 7.0.200-preview.23060.2
- 7.0.200-preview.23060.2
+ 7.0.200
+ 7.0.200-rtm.23073.5
+ 7.0.200-rtm.23073.5
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
@@ -76,20 +76,20 @@
- 7.0.0-rtm.22518.5
- 7.0.0-rtm.22518.5
- 7.0.0
- 7.0.0
- 7.0.0
- 7.0.0
+ 7.0.3-servicing.23069.10
+ 7.0.3-servicing.23069.10
+ 7.0.3
+ 7.0.3
+ 7.0.3
+ 7.0.3
2.1.0
- 7.0.0-rtm.22519.1
- 7.0.0-rtm.22519.1
- 7.0.0
- 7.0.0
+ 7.0.3-servicing.23072.2
+ 7.0.3-servicing.23072.2
+ 7.0.3
+ 7.0.3
@@ -205,8 +205,8 @@
12.3.2372
16.0.1478
$(MicrosoftNETCoreAppRefPackageVersion)
- 7.0.0
- 7.0.0
+ 7.0.3
+ 7.0.3
$(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)
diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch
deleted file mode 100644
index ab355630e..000000000
--- a/src/SourceBuild/tarball/patches/aspnetcore/0001-ResolvePackageFileConflicts-workaround.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MichaelSimons
-Date: Fri, 11 Nov 2022 21:10:54 +0000
-Subject: [PATCH] ResolvePackageFileConflicts workaround
-
----
- .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
-index 3b5d2ae950..f92fb421fe 100644
---- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
-+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
-@@ -253,6 +253,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
-
-
-
-+
-+
-+
-
-
-