[maestro] Subscribe to the .NET 7 channel to get bumps for our own .NET 7 packages for .NET 8. (#16859)

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:
Rolf Bjarne Kvinge 2022-11-23 07:34:40 +01:00 коммит произвёл GitHub
Родитель ef8f19de9d
Коммит 2941b413ce
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 29 добавлений и 9 удалений

Просмотреть файл

@ -582,11 +582,16 @@ MONO_MACCATALYST_SDK_DESTDIR:=$(abspath $(MONO_PATH)/sdks/out)
MONO_BUILD_MODE=compile-mono
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
$(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 MicrosoftNETCoreAppRefPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETCoreAppRefPackageVersion>//g' -e 's/[ \t]*/BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION=/' >> $@.tmp
$(Q) grep MicrosoftNETWorkloadEmscriptennet7Manifest80100Version $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>//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]*/NET7_$(shell echo $(platform) | tr '[:lower:]' '[:upper:]')_NUGET_VERSION_NO_METADATA=/' >> $@.tmp &&) true
$(Q) mv $@.tmp $@
DOTNET_DESTDIR ?= $(TOP)/_build
@ -655,10 +660,6 @@ DOTNET_TVOS_ASSEMBLY_NAME=Microsoft.tvOS
DOTNET_MACCATALYST_ASSEMBLY_NAME=Microsoft.MacCatalyst
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=
ifdef INCLUDE_IOS
DOTNET_PLATFORMS+=iOS

Просмотреть файл

@ -92,8 +92,5 @@ NET6_WATCHOS_NUGET_VERSION_NO_METADATA=8.5.447
NET6_MACOS_NUGET_VERSION_NO_METADATA=12.3.470
NET6_MACCATALYST_NUGET_VERSION_NO_METADATA=15.4.470
# These variables must be updated whenever we release a new stable version into .NET 7
NET7_IOS_NUGET_VERSION_NO_METADATA=16.0.1468
NET7_TVOS_NUGET_VERSION_NO_METADATA=16.0.1468
NET7_MACOS_NUGET_VERSION_NO_METADATA=12.3.2364
NET7_MACCATALYST_NUGET_VERSION_NO_METADATA=15.4.2364
# .NET 7 versions are bumped using maestro.

Просмотреть файл

@ -21,6 +21,23 @@
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>b6656f5b78cd25f984355f973e65da3d844ac6d1</Sha>
</Dependency>
<!-- This is a subscription of the .NET 7 versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.1.1469">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>6b367e149fa1eb807aa1210780547d9357301c6e</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk" Version="13.0.2024">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>6b367e149fa1eb807aa1210780547d9357301c6e</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk" Version="16.1.1469">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>6b367e149fa1eb807aa1210780547d9357301c6e</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.1.1469">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>6b367e149fa1eb807aa1210780547d9357301c6e</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21212.6">

Просмотреть файл

@ -9,5 +9,10 @@
<MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>8.0.0-alpha.1.22510.1</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
<MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22554.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
<!-- This is a subscription of the .NET 7 versions of our packages -->
<MicrosoftMacCatalystSdkPackageVersion>16.1.1469</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.0.2024</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.1.1469</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.1.1469</MicrosofttvOSSdkPackageVersion>
</PropertyGroup>
</Project>