diff --git a/NuGet.config b/NuGet.config
index 770df6dcb..8ca01d0f3 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,16 +7,23 @@
+
+
+
+
+
+
+
@@ -38,11 +45,15 @@
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9ef109d57..8bb541249 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
+ f51697b054c6691ed59209ef8524013d44bb449c
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 417429fc040af552532bb07aad29e5e8639b840f
+ f51697b054c6691ed59209ef8524013d44bb449c
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 417429fc040af552532bb07aad29e5e8639b840f
+ f51697b054c6691ed59209ef8524013d44bb449c
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 417429fc040af552532bb07aad29e5e8639b840f
+ f51697b054c6691ed59209ef8524013d44bb449c
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ d037e070ebe5c83838443f869d5800752b0fcb13
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ d037e070ebe5c83838443f869d5800752b0fcb13
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ d037e070ebe5c83838443f869d5800752b0fcb13
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ d037e070ebe5c83838443f869d5800752b0fcb13
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ d037e070ebe5c83838443f869d5800752b0fcb13
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ d037e070ebe5c83838443f869d5800752b0fcb13
@@ -52,34 +52,34 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- bb01bbf4433e27289b99001b7de6a582879d1835
+ 7c810658463f35c39c54d5fb8a8dbbfd463bf747
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- bb01bbf4433e27289b99001b7de6a582879d1835
+ 7c810658463f35c39c54d5fb8a8dbbfd463bf747
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- bb01bbf4433e27289b99001b7de6a582879d1835
+ 7c810658463f35c39c54d5fb8a8dbbfd463bf747
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- bb01bbf4433e27289b99001b7de6a582879d1835
+ 7c810658463f35c39c54d5fb8a8dbbfd463bf747
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- bb01bbf4433e27289b99001b7de6a582879d1835
+ 7c810658463f35c39c54d5fb8a8dbbfd463bf747
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- bb01bbf4433e27289b99001b7de6a582879d1835
+ 7c810658463f35c39c54d5fb8a8dbbfd463bf747
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- bb01bbf4433e27289b99001b7de6a582879d1835
+ 7c810658463f35c39c54d5fb8a8dbbfd463bf747
https://github.com/dotnet/test-templates
@@ -98,39 +98,39 @@
aaaa0c1826f97a9dfcc67e94136bf01010b55f23
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 882a576873b701f79d6584e4a0cf84036fdcd83f
+ 98720693e228934405de152651b2e21390c3bfec
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 882a576873b701f79d6584e4a0cf84036fdcd83f
+ 98720693e228934405de152651b2e21390c3bfec
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 882a576873b701f79d6584e4a0cf84036fdcd83f
+ 98720693e228934405de152651b2e21390c3bfec
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 882a576873b701f79d6584e4a0cf84036fdcd83f
+ 98720693e228934405de152651b2e21390c3bfec
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- e83409daa530605da4eb5f847c6740a520325d25
+ 8b06c27c9b81f33e69f8d5155fe69693f661fa3d
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- 636e2b7a00a434a354a126f510a56e16ce3c6bbc
+ df04c57b2e2bb986f0afc2384cbebb3c950447b5
-
+
https://github.com/dotnet/fsharp
- c370ee09c2eebcc750a59e9c10e52792679f896e
+ 1d892dd78d5dcb261a1d26f72efb333834436a02
-
+
https://github.com/dotnet/fsharp
- c370ee09c2eebcc750a59e9c10e52792679f896e
+ 1d892dd78d5dcb261a1d26f72efb333834436a02
@@ -138,20 +138,20 @@
c02ece877c62577810f893c44279ce79af820112
-
+
https://github.com/dotnet/linker
- 219e84c88def8276179f66282b2f7cb5f1d0d126
+ 8db10f44053ed4cb95a99676ac7b8ccae681b79d
linker
-
+
https://github.com/dotnet/roslyn
- 9e075f038a19d493244bc18997fc52a6c6eefa72
+ d7a61210a88b584ca0827585ec6e871c6b1c5a14
-
+
https://github.com/dotnet/msbuild
- 18d5aef85920037c9d6ff49b1215a4daf515197f
+ 9a89d02ff5de19d84190ebed4a6017df4dc19dc4
@@ -163,13 +163,13 @@
https://github.com/Microsoft/ApplicationInsights-dotnet
53b80940842204f78708a538628288ff5d741a1d
-
+
https://github.com/dotnet/emsdk
- 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31
+ d71ea7cbed84152a921c7b7b4b4439c306bf9130
-
+
https://github.com/dotnet/emsdk
- 6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31
+ d71ea7cbed84152a921c7b7b4b4439c306bf9130
https://github.com/dotnet/deployment-tools
@@ -186,6 +186,12 @@
7b9791daa3a3477eb22ec805946c9fff8b42d8ca
+
+
+ https://github.com/dotnet/format
+ 6a22157622e5da71ba0c43d23269352210bdb277
+
+
diff --git a/eng/Versions.props b/eng/Versions.props
index 352f80c26..7fb285690 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.2-servicing.22606.2
@@ -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.2
+ 7.0.2
+ 7.0.2-servicing.22606.6
+ 7.0.2-servicing.22606.6
+ 7.0.2-servicing.22606.6
+ 7.0.2-servicing.22606.6
+ 7.0.2-servicing.22606.6
0.2.0
- 7.0.100
- 7.0.100-rtm.22521.7
- 7.0.100-rtm.22521.7
+ 7.0.102
+ 7.0.102-servicing.22607.4
+ 7.0.102-servicing.22607.4
$(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.2-servicing.22606.5
+ 7.0.2-servicing.22606.5
+ 7.0.2
+ 7.0.2
+ 7.0.2
+ 7.0.2
2.1.0
- 7.0.0-rtm.22519.1
- 7.0.0-rtm.22519.1
- 7.0.0
- 7.0.0
+ 7.0.2-servicing.22607.1
+ 7.0.2-servicing.22607.1
+ 7.0.2
+ 7.0.2
@@ -205,8 +205,8 @@
12.3.2372
16.0.1478
$(MicrosoftNETCoreAppRefPackageVersion)
- 7.0.0
- 7.0.0
+ 7.0.2
+ 7.0.2
$(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)
diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
index e7a9698c6..97f4b4ce3 100644
--- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
+++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
@@ -285,10 +285,6 @@
-
-
diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props
index a0feed9d1..8880b5d05 100644
--- a/src/SourceBuild/tarball/content/Directory.Build.props
+++ b/src/SourceBuild/tarball/content/Directory.Build.props
@@ -23,19 +23,6 @@
x64
false
-
- false
-
- true
- true
-
-
- false
- false
- true
- false
@@ -236,12 +223,8 @@
-
-
-
-
diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj
index c11f22f5c..cea712c1b 100644
--- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj
+++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj
@@ -9,6 +9,7 @@
$(BuildCommandArgs) --no-build-repo-tasks
$(BuildCommandArgs) --no-build-nodejs
$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime)
+ $(BuildCommandArgs) /p:PortableBuild=false /p:TargetRuntimeIdentifier=$(TargetRid)
$(BuildCommandArgs) /p:MicrosoftNetFrameworkReferenceAssembliesVersion=1.0.0
diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj
index 4226bc62b..3a9756a27 100644
--- a/src/SourceBuild/tarball/content/repos/installer.proj
+++ b/src/SourceBuild/tarball/content/repos/installer.proj
@@ -30,7 +30,7 @@
$(BuildCommandArgs) /p:Rid=$(TargetRid)
$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)
- $(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform)
+ $(BuildCommandArgs) /p:AspNetCoreInstallerRid=$(TargetRid)
$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true
$(BuildCommandArgs) /p:CoreSetupRid=osx-x64
diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj
index 6f96a2fdf..0adee7f53 100644
--- a/src/SourceBuild/tarball/content/repos/known-good.proj
+++ b/src/SourceBuild/tarball/content/repos/known-good.proj
@@ -43,7 +43,6 @@
-
diff --git a/src/SourceBuild/tarball/content/repos/package-source-build.proj b/src/SourceBuild/tarball/content/repos/package-source-build.proj
index 0ada671fb..fbc5a0cc1 100644
--- a/src/SourceBuild/tarball/content/repos/package-source-build.proj
+++ b/src/SourceBuild/tarball/content/repos/package-source-build.proj
@@ -50,7 +50,7 @@
$(OutputPath)$(SourceBuiltArtifactsTarballName).$(installerOutputPackageVersion).tar.gz
-
diff --git a/src/SourceBuild/tarball/content/repos/runtime-portable.proj b/src/SourceBuild/tarball/content/repos/runtime-portable.proj
deleted file mode 100644
index 09b4625e9..000000000
--- a/src/SourceBuild/tarball/content/repos/runtime-portable.proj
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
- runtime
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(ProjectDirectory)artifacts/portableLog
- $(ProjectDirectory)artifacts/portableObj
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/SourceBuild/tarball/content/repos/runtime.common.props b/src/SourceBuild/tarball/content/repos/runtime.common.props
deleted file mode 100644
index cb02932f9..000000000
--- a/src/SourceBuild/tarball/content/repos/runtime.common.props
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
- runtime
-
-
-
-
-
-
- true
-
-
- $(StandardSourceBuildArgs.Replace('-bl', '-nobl'))
-
- $(StandardSourceBuildCommand) $(BuildCommandArgs)
- $(ArmEnvironmentVariables) $(StandardSourceBuildCommand) $(BuildCommandArgs)
-
- $(ProjectDirectory)/clean$(ShellExtension)
-
-
-
-
- $(ProjectDirectory)global.json
- $(ProjectDirectory)NuGet.config
- false
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/SourceBuild/tarball/content/repos/runtime.common.targets b/src/SourceBuild/tarball/content/repos/runtime.common.targets
deleted file mode 100644
index 862b70dc8..000000000
--- a/src/SourceBuild/tarball/content/repos/runtime.common.targets
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(ProjectDirectory)pkg/Microsoft.NETCore.Platforms/runtime.json
-
-
-
-
-
-
-
-
- <_builtRuntimePackages Include="$(SourceBuiltAssetsDir)*.symbols.nupkg" />
- <_builtRuntimePackages>
- $([System.String]::Copy('%(FileName)').Replace('symbols', 'nupkg'))
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/SourceBuild/tarball/content/repos/runtime.proj b/src/SourceBuild/tarball/content/repos/runtime.proj
index 59ea1d6fc..85d0efa77 100644
--- a/src/SourceBuild/tarball/content/repos/runtime.proj
+++ b/src/SourceBuild/tarball/content/repos/runtime.proj
@@ -1,18 +1,57 @@
-
+
+
+ true
+
+ $(ProjectDirectory)/clean$(ShellExtension)
+
$(TargetRid)
osx-x64
freebsd-x64
win-x64
+ <_platformIndex>$(NETCoreSdkRuntimeIdentifier.LastIndexOf('-'))
+ $(NETCoreSdkRuntimeIdentifier.Substring(0, $(_platformIndex)))
+
+ <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))
+ $(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex)))
+
$(StandardSourceBuildArgs)
$(BuildCommandArgs) /p:TargetRid=$(OverrideTargetRid)
+ $(BuildCommandArgs) /p:RuntimeOS=$(RuntimeOS)
+ $(BuildCommandArgs) /p:BaseOS=$(BaseOS)
$(BuildCommandArgs) /p:SourceBuildNonPortable=true
$(StandardSourceBuildCommand) $(BuildCommandArgs)
+
+
+ $(ProjectDirectory)global.json
+ $(ProjectDirectory)NuGet.config
+ false
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -20,8 +59,49 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ $(ProjectDirectory)pkg/Microsoft.NETCore.Platforms/runtime.json
+
+
+
+
+
+
+
+
+ <_builtRuntimePackages Include="$(SourceBuiltAssetsDir)*.symbols.nupkg" />
+ <_builtRuntimePackages>
+ $([System.String]::Copy('%(FileName)').Replace('symbols', 'nupkg'))
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj
index a4fb27340..c1321e716 100644
--- a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj
+++ b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj
@@ -4,7 +4,11 @@
$(BaseIntermediatePath)source-build-reference-package-cache
- $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) /p:LocalNuGetPackageCacheDirectory=$(LocalNuGetPackageCacheDirectory)
+ $(StandardSourceBuildArgs)
+ $(BuildCommandArgs) /p:MicrosoftNetCoreIlasmPackageRuntimeId=$(NETCoreSdkRuntimeIdentifier)
+ $(BuildCommandArgs) /p:LocalNuGetPackageCacheDirectory=$(LocalNuGetPackageCacheDirectory)
+
+ $(StandardSourceBuildCommand) $(BuildCommandArgs)
$(ProjectDirectory)NuGet.config
$(ProjectDirectory)global.json
diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj
index b2c3beed1..0405ad8f1 100644
--- a/src/SourceBuild/tarball/content/tools-local/init-build.proj
+++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj
@@ -9,6 +9,7 @@
+
@@ -22,6 +23,7 @@
+
+
+
+
+
+
microsoft.netcore.app.runtime.$(SharedFrameworkRid)
- microsoft.netcore.app.crossgen2.$(HostOSName)-$(BuildArchitecture)
+ microsoft.netcore.app.crossgen2.$(Crossgen2Rid)
$(NuGetPackageRoot)/$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension)
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index ae911ab1c..308fdfb2b 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -84,6 +84,9 @@
dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)
windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)
+ $(HostOSName)-$(BuildArchitecture)
+ $(SharedFrameworkRid)
+
$(SharedFrameworkRid)
linux-x64
$(AspNetCoreInstallerRid)