[release/7.0.1xx] [maestro] Subscribe to the .NET 6 channel to get bumps for our own .NET 6 packages for .NET 7. (#16904)
We need the latest released version numbers for the previous .NET version so that we can reference and consume those when building projects using the corresponding target framework. Luckily we have a system for keeping dependencies up-to-date, so let's use it to notify the current branch for any updates to the release branch for the previous .NET version.
This commit is contained in:
Родитель
cc0f0fc853
Коммит
8ee45638b4
10
Make.config
10
Make.config
|
@ -614,11 +614,17 @@ MONO_MACCATALYST_SDK_DESTDIR:=$(abspath $(MONO_PATH)/sdks/out)
|
||||||
MONO_BUILD_MODE=compile-mono
|
MONO_BUILD_MODE=compile-mono
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# This variable includes all the platforms we support, even those that might be disabled in this build.
|
||||||
|
ALL_PLATFORMS=iOS tvOS watchOS macOS
|
||||||
|
ALL_DOTNET_PLATFORMS=iOS macOS tvOS MacCatalyst
|
||||||
|
|
||||||
-include $(TOP)/dotnet.config
|
-include $(TOP)/dotnet.config
|
||||||
$(TOP)/dotnet.config: $(TOP)/eng/Versions.props
|
$(TOP)/dotnet.config: $(TOP)/eng/Versions.props
|
||||||
$(Q) grep MicrosoftDotnetSdkInternalPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftDotnetSdkInternalPackageVersion>//g' -e 's/[ \t]*/DOTNET_VERSION=/' >> $@.tmp
|
$(Q) grep MicrosoftDotnetSdkInternalPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftDotnetSdkInternalPackageVersion>//g' -e 's/[ \t]*/DOTNET_VERSION=/' >> $@.tmp
|
||||||
$(Q) grep MicrosoftNETCoreAppRefPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETCoreAppRefPackageVersion>//g' -e 's/[ \t]*/BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION=/' >> $@.tmp
|
$(Q) grep MicrosoftNETCoreAppRefPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETCoreAppRefPackageVersion>//g' -e 's/[ \t]*/BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION=/' >> $@.tmp
|
||||||
$(Q) grep MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>//g' -e 's/[ \t]*/EMSCRIPTEN_MANIFEST_PACKAGE_VERSION=/' >> $@.tmp
|
$(Q) grep MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>//g' -e 's/[ \t]*/EMSCRIPTEN_MANIFEST_PACKAGE_VERSION=/' >> $@.tmp
|
||||||
|
$(Q) grep MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>//g' -e 's/[ \t]*/EMSCRIPTEN_MANIFEST_PACKAGE_VERSION=/' >> $@.tmp
|
||||||
|
$(Q) $(foreach platform,$(ALL_DOTNET_PLATFORMS),grep Microsoft$(platform)SdkPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*Microsoft$(platform)SdkPackageVersion>//g' -e 's/[ \t]*/NET6_$(shell echo $(platform) | tr '[:lower:]' '[:upper:]')_NUGET_VERSION_NO_METADATA=/' >> $@.tmp &&) true
|
||||||
$(Q) mv $@.tmp $@
|
$(Q) mv $@.tmp $@
|
||||||
|
|
||||||
DOTNET_DESTDIR ?= $(TOP)/_build
|
DOTNET_DESTDIR ?= $(TOP)/_build
|
||||||
|
@ -684,10 +690,6 @@ DOTNET_TVOS_ASSEMBLY_NAME=Microsoft.tvOS
|
||||||
DOTNET_MACCATALYST_ASSEMBLY_NAME=Microsoft.MacCatalyst
|
DOTNET_MACCATALYST_ASSEMBLY_NAME=Microsoft.MacCatalyst
|
||||||
DOTNET_MACOS_ASSEMBLY_NAME=Microsoft.macOS
|
DOTNET_MACOS_ASSEMBLY_NAME=Microsoft.macOS
|
||||||
|
|
||||||
# This variable includes all the platforms we support, even those that might be disabled in this build.
|
|
||||||
ALL_PLATFORMS=iOS tvOS watchOS macOS
|
|
||||||
ALL_DOTNET_PLATFORMS=iOS macOS tvOS MacCatalyst
|
|
||||||
|
|
||||||
DOTNET_PLATFORMS=
|
DOTNET_PLATFORMS=
|
||||||
ifdef INCLUDE_IOS
|
ifdef INCLUDE_IOS
|
||||||
DOTNET_PLATFORMS+=iOS
|
DOTNET_PLATFORMS+=iOS
|
||||||
|
|
|
@ -85,10 +85,3 @@ DEFAULT_TARGET_PLATFORM_VERSION_TVOS=16.1
|
||||||
DEFAULT_TARGET_PLATFORM_VERSION_WATCHOS=9.1
|
DEFAULT_TARGET_PLATFORM_VERSION_WATCHOS=9.1
|
||||||
DEFAULT_TARGET_PLATFORM_VERSION_MACOS=13.0
|
DEFAULT_TARGET_PLATFORM_VERSION_MACOS=13.0
|
||||||
DEFAULT_TARGET_PLATFORM_VERSION_MACCATALYST=16.1
|
DEFAULT_TARGET_PLATFORM_VERSION_MACCATALYST=16.1
|
||||||
|
|
||||||
# These variables must be updated whenever we release a new stable version into .NET 6
|
|
||||||
NET6_IOS_NUGET_VERSION_NO_METADATA=16.1.228
|
|
||||||
NET6_TVOS_NUGET_VERSION_NO_METADATA=16.1.228
|
|
||||||
NET6_WATCHOS_NUGET_VERSION_NO_METADATA=8.5.447
|
|
||||||
NET6_MACOS_NUGET_VERSION_NO_METADATA=13.0.783
|
|
||||||
NET6_MACCATALYST_NUGET_VERSION_NO_METADATA=16.1.228
|
|
||||||
|
|
|
@ -21,6 +21,23 @@
|
||||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||||
<Sha>73eb13444bdee019ec91191f96fd866661acbc78</Sha>
|
<Sha>73eb13444bdee019ec91191f96fd866661acbc78</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
|
<!-- This is a subscription of the .NET 6 versions of our packages -->
|
||||||
|
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.1.228">
|
||||||
|
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
|
||||||
|
<Sha>bb0d6837dc6025cea163315ae47054b64a505205</Sha>
|
||||||
|
</Dependency>
|
||||||
|
<Dependency Name="Microsoft.macOS.Sdk" Version="13.0.783">
|
||||||
|
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
|
||||||
|
<Sha>bb0d6837dc6025cea163315ae47054b64a505205</Sha>
|
||||||
|
</Dependency>
|
||||||
|
<Dependency Name="Microsoft.iOS.Sdk" Version="16.1.228">
|
||||||
|
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
|
||||||
|
<Sha>bb0d6837dc6025cea163315ae47054b64a505205</Sha>
|
||||||
|
</Dependency>
|
||||||
|
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.1.228">
|
||||||
|
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
|
||||||
|
<Sha>bb0d6837dc6025cea163315ae47054b64a505205</Sha>
|
||||||
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21212.6">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21212.6">
|
||||||
|
|
|
@ -8,5 +8,10 @@
|
||||||
<MicrosoftNETCoreAppRefPackageVersion>7.0.1</MicrosoftNETCoreAppRefPackageVersion>
|
<MicrosoftNETCoreAppRefPackageVersion>7.0.1</MicrosoftNETCoreAppRefPackageVersion>
|
||||||
<MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.1</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
|
<MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.1</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
|
||||||
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
|
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
|
||||||
|
<!-- This is a subscription of the .NET 6 versions of our packages -->
|
||||||
|
<MicrosoftMacCatalystSdkPackageVersion>16.1.228</MicrosoftMacCatalystSdkPackageVersion>
|
||||||
|
<MicrosoftmacOSSdkPackageVersion>13.0.783</MicrosoftmacOSSdkPackageVersion>
|
||||||
|
<MicrosoftiOSSdkPackageVersion>16.1.228</MicrosoftiOSSdkPackageVersion>
|
||||||
|
<MicrosofttvOSSdkPackageVersion>16.1.228</MicrosofttvOSSdkPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче