diff --git a/NuGet.config b/NuGet.config
index 3e6d96c15..42cd0ea91 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,29 +7,21 @@
-
+
-
-
-
+
-
-
-
-
-
-
-
+
-
+
-
+
@@ -50,23 +42,15 @@
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 12d34ade0..4d68b58b6 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,46 +1,46 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 74607da18cfa95417e1bddf02c80fb97e48c7f46
+ ee26d5bddd7cf13b37987de68fee12d9e50ff33d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 74607da18cfa95417e1bddf02c80fb97e48c7f46
+ ee26d5bddd7cf13b37987de68fee12d9e50ff33d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 74607da18cfa95417e1bddf02c80fb97e48c7f46
+ ee26d5bddd7cf13b37987de68fee12d9e50ff33d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 74607da18cfa95417e1bddf02c80fb97e48c7f46
+ ee26d5bddd7cf13b37987de68fee12d9e50ff33d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 5a400c212afdf8e675c9a1d38442e6d2f19f7b74
+ 943474ca16db7c65ba6cff4a89c3ebd219dde3e5
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 5a400c212afdf8e675c9a1d38442e6d2f19f7b74
+ 943474ca16db7c65ba6cff4a89c3ebd219dde3e5
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 5a400c212afdf8e675c9a1d38442e6d2f19f7b74
+ 943474ca16db7c65ba6cff4a89c3ebd219dde3e5
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 5a400c212afdf8e675c9a1d38442e6d2f19f7b74
+ 943474ca16db7c65ba6cff4a89c3ebd219dde3e5
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 5a400c212afdf8e675c9a1d38442e6d2f19f7b74
+ 943474ca16db7c65ba6cff4a89c3ebd219dde3e5
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 5a400c212afdf8e675c9a1d38442e6d2f19f7b74
+ 943474ca16db7c65ba6cff4a89c3ebd219dde3e5
@@ -48,34 +48,34 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 5a400c212afdf8e675c9a1d38442e6d2f19f7b74
+ 943474ca16db7c65ba6cff4a89c3ebd219dde3e5
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173
+ 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173
+ 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173
+ 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173
+ 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173
+ 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173
+ 617d594f2bf75a8904d3d0e7d68a0bacf8e6763a
https://github.com/dotnet/test-templates
@@ -90,36 +90,36 @@
c40ef7e056b48e011c43a21354d6790ba6b8b4fc
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27
+ 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27
+ 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-templating
- abad6c0ec8f1f7f65a233956f4d02bbfd3cd0c27
+ 6e2c3a8926045e73af9e503eaeb5443a82ac6d5e
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- a886cd6214c92f6a5d955c056014820c35591e7b
+ 8f6e48c18dda13f4ddb7b447d4602629099d3639
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- a886cd6214c92f6a5d955c056014820c35591e7b
+ 8f6e48c18dda13f4ddb7b447d4602629099d3639
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 729cc7ccdec38bb23e6216a371293bb5ce738b5a
+ cf9269e4b3f8f3d74a59e90c19ec6f8d390bcad4
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- 3bbc77257e3d51a2e19195523eafd262da1f5459
+ 96c5254e5ca5040021caf779216b1b3641875b1e
https://github.com/dotnet/fsharp
@@ -166,9 +166,9 @@
698fdad58fa64a55f16cd9562c90224cc498ed02
-
+
https://github.com/dotnet/emsdk
- c3fc739ca5a38641fe021f94c3986465296c71e0
+ 374833d8416df22155bc0509559352af65bd8266
https://github.com/dotnet/source-build
@@ -211,9 +211,9 @@
https://github.com/dotnet/arcade
bb1e72113a7eaf8bebda940beba8cf8bee1b453f
-
+
https://github.com/dotnet/source-build-reference-packages
- fdbbfadcaa5804038ad0a3f67c33f489cbeda65c
+ 1d46a08542f49e0f2fdedea6710cc5f6bbc70b96
diff --git a/eng/Versions.props b/eng/Versions.props
index b5a9289dd..64c76b641 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,15 +23,15 @@
- 6.0.10-servicing.22476.6
+ 6.0.11-servicing.22523.4
- 6.0.10-servicing.22476.4
+ 6.0.11-servicing.22523.2
- 6.0.110
+ 6.0.111
@@ -44,44 +44,44 @@
- 6.0.10
- 6.0.10
- 6.0.10-servicing.22476.17
- 6.0.10-servicing.22476.17
- 6.0.10-servicing.22476.17
- 6.0.10-servicing.22476.17
+ 6.0.11
+ 6.0.11
+ 6.0.11-servicing.22523.4
+ 6.0.11-servicing.22523.4
+ 6.0.11-servicing.22523.4
+ 6.0.11-servicing.22523.4
0.2.0
- 6.0.110-servicing.22476.46
- 6.0.110-servicing.22476.46
+ 6.0.111-servicing.22523.21
+ 6.0.111-servicing.22523.21
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 6.0.6
+ 6.0.7
- 6.0.10-servicing.22476.5
- 6.0.10-servicing.22476.5
- 6.0.10
- 6.0.10
- 6.0.10
- 6.0.10
+ 6.0.11-servicing.22523.4
+ 6.0.11-servicing.22523.4
+ 6.0.11
+ 6.0.11
+ 6.0.11
+ 6.0.11
2.1.0
- 6.0.10-servicing.22476.6
- 6.0.10-servicing.22476.6
- 6.0.10
- 6.0.10
+ 6.0.11-servicing.22523.3
+ 6.0.11-servicing.22523.3
+ 6.0.11
+ 6.0.11
@@ -115,7 +115,7 @@
$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)
$(NUnit3DotNetNewTemplatePackageVersion)
$(MicrosoftDotNetCommonItemTemplatesPackageVersion)
- 6.0.110
+ 6.0.111
$(MicrosoftAspNetCoreAppRuntimePackageVersion)
$(MicrosoftWinFormsProjectTemplates50PackageVersion)
@@ -185,7 +185,7 @@
12.0.101-preview.9.31
15.0.101-preview.9.31
$(MicrosoftNETCoreAppRefPackageVersion)
- 6.0.10
+ 6.0.11
$(MicrosoftNETWorkloadEmscriptenManifest60100Version)
diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
index dd9e211dd..c3c5a5fca 100644
--- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
+++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
@@ -84,22 +84,19 @@ jobs:
${{ else }}:
${{ parameters.poolInternalAmd64 }}
-- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
parameters:
architecture: arm64
dependsOn: ${{ parameters.dependsOn }}
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
- excludeSdkContentTests: true
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
matrix:
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
- Debian9-Offline:
- _BootstrapPrep: true
- _Container: ${{ parameters.debian9Arm64Container }}
- _EnablePoison: false
- _ExcludeOmniSharpTests: false
- _RunOnline: false
+ Debian9-Offline:
+ _BootstrapPrep: true
+ _Container: ${{ parameters.debian9Arm64Container }}
+ _EnablePoison: false
+ _ExcludeOmniSharpTests: false
+ _RunOnline: false
name: Build_Tarball_arm64
pool: ${{ parameters.poolInternalArm64 }}
diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj
index a03a69fc5..4d00be9ad 100644
--- a/src/SourceBuild/tarball/content/repos/fsharp.proj
+++ b/src/SourceBuild/tarball/content/repos/fsharp.proj
@@ -27,6 +27,7 @@
+
diff --git a/src/SourceBuild/tarball/patches/fsharp/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch b/src/SourceBuild/tarball/patches/fsharp/0002-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch
similarity index 100%
rename from src/SourceBuild/tarball/patches/fsharp/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch
rename to src/SourceBuild/tarball/patches/fsharp/0002-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch