diff --git a/Make.config b/Make.config index 0c4f1cbb3dc0..0adb98cf2210 100644 --- a/Make.config +++ b/Make.config @@ -665,7 +665,7 @@ ALL_PLATFORMS=iOS tvOS watchOS macOS ALL_DOTNET_PLATFORMS=iOS macOS tvOS MacCatalyst # Set this to 1 if the Microsoft.NETCore.App.Ref dependency in eng/Version.Details.xml does *not* specify a CoherentParentDependency on Microsoft.Dotnet.Sdk.Internal. -TRACKING_DOTNET_RUNTIME_SEPARATELY= +TRACKING_DOTNET_RUNTIME_SEPARATELY=1 -include $(TOP)/dotnet.config $(TOP)/dotnet.config: $(TOP)/eng/Versions.props $(TOP)/Build.props @@ -749,7 +749,7 @@ EMSCRIPTEN_MANIFEST_VERSION_BAND=$(DOTNET_MANIFEST_VERSION_BAND_WITH_PRERELEASE_ MACIOS_MANIFEST_VERSION_BAND=$(DOTNET_MANIFEST_VERSION_BAND_WITH_PRERELEASE_COMPONENT) # Set this to 1 if the Microsoft.NETCore.App.Ref dependency in eng/Version.Details.xml does *not* specify a CoherentParentDependency on VS.Tools.Net.Core.SDK.Resolver. -TRACKING_DOTNET_RUNTIME_SEPARATELY= +TRACKING_DOTNET_RUNTIME_SEPARATELY=1 # The location of csc changes depending on whether we're using a preview or a stable/service release :/ DOTNET_CSC_PATH_PREVIEW=$(DOTNET_DIR)/sdk/$(DOTNET_VERSION)/Roslyn/bincore/csc.dll diff --git a/builds/Makefile b/builds/Makefile index 3a33d9754283..fce030ffbbf4 100644 --- a/builds/Makefile +++ b/builds/Makefile @@ -119,15 +119,7 @@ endif endif .stamp-install-custom-dotnet-runtime-workloads: -ifneq ($(TRACKING_DOTNET_RUNTIME_SEPARATELY),) - @# mono toolchain - $(Q) mkdir -p ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(MONO_TOOLCHAIN_MANIFEST_VERSION_BAND) - $(Q) $(CP) $(TOP)/packages/microsoft.net.workload.mono.toolchain.net7.manifest-$(MONO_TOOLCHAIN_MANIFEST_VERSION_BAND)/$(DOWNLOAD_DOTNET_VERSION)/data/WorkloadManifest.* ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(MONO_TOOLCHAIN_MANIFEST_VERSION_BAND)/microsoft.net.workload.mono.toolchain.net7/ - @# emscripten, which mono depends on - $(Q) mkdir -p ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(EMSCRIPTEN_MANIFEST_VERSION_BAND) - $(Q) $(CP) $(TOP)/packages/microsoft.net.workload.emscripten.net7.manifest-$(EMSCRIPTEN_MANIFEST_VERSION_BAND)/$(EMSCRIPTEN_MANIFEST_PACKAGE_VERSION)/data/WorkloadManifest.* ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(EMSCRIPTEN_MANIFEST_VERSION_BAND)/microsoft.net.workload.emscripten.net7/ $(Q) touch $@ -endif package-download/all-package-references.csproj: $(GIT_DIRECTORY)/HEAD $(GIT_DIRECTORY)/index ./create-csproj-for-all-packagereferences.sh $(Q_GEN) ./create-csproj-for-all-packagereferences.sh --output "$(abspath $@.tmp)" $(if $(V),-v,) diff --git a/builds/package-download/download-packages.csproj b/builds/package-download/download-packages.csproj index 95b1db9dedec..a082976a12a6 100644 --- a/builds/package-download/download-packages.csproj +++ b/builds/package-download/download-packages.csproj @@ -19,12 +19,6 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70438f62d6e0..00c6e69f9a31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,31 +4,31 @@ https://github.com/dotnet/sdk f59e9ca09cb4d5b903b276c0d3d7825b6ddbc3a0 - + https://github.com/dotnet/runtime - cf47d9ff6827a3e1d6f2acbf925cd618418f20dd + 200d05e41fc2212ff8c98ed79ebe9043bfed58aa https://github.com/dotnet/runtime 2c4266c134aa02718179818098a11e825c9d1362 - + https://github.com/dotnet/runtime - 2c4266c134aa02718179818098a11e825c9d1362 + 200d05e41fc2212ff8c98ed79ebe9043bfed58aa https://github.com/dotnet/aspnetcore afe2857bffef08213d6f3c7688647c60d5d5e7bd - + https://github.com/dotnet/emsdk - 8e660ff41e91879977e3a9d837e068bd72234c26 + 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df - + https://github.com/dotnet/cecil - 526b22d829bc9b420dff6ef70877a67053b66e0f + 1541df9c44ff8da964b2946e18655c2e37e4a198 @@ -64,9 +64,9 @@ https://github.com/xamarin/xamarin-macios 06fea905cf900ab5296b08d7b67dadddc733dd65 - + https://github.com/dotnet/runtime - 9bff9c5017d8444fdf76959c112dd9fed2da9317 + 200d05e41fc2212ff8c98ed79ebe9043bfed58aa diff --git a/eng/Versions.props b/eng/Versions.props index fca800893758..714dd23320fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,14 +4,14 @@ 9.0.100-rc.2.24475.4 9.0.0-rtm.24475.3 - 9.0.0-alpha.1.23556.4 + 9.0.0-rc.2.24473.4 9.0.0-beta.24408.2 8.0.0-beta.24413.2 - 9.0.0-rtm.24475.3 + 9.0.0-rc.2.24473.4 8.0.0-rtm.23511.3 - 9.0.0-rc.2.24462.10 + 9.0.0-rc.2.24473.4 7.0.100-alpha.1.21601.1 - 0.11.5-alpha.24467.1 + 0.11.5-alpha.24460.1 10.0.0-prerelease.24467.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)