[net7.0-xcode14.1] Update dependencies from dotnet/installer (#16455)
This pull request updates the following dependencies ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22512.1 (parent: Microsoft.Dotnet.Sdk.Internal) ## From https://github.com/dotnet/installer - **Subscription**: df408977-ead8-4cfb-e40b-08dab20af502 - **Build**: 20221019.39 - **Date Produced**: October 20, 2022 12:51:36 AM UTC - **Commit**: e6dd91c290b808f971a1ac69c2fb29395bbf1051 - **Branch**: refs/heads/release/7.0.1xx - **Updates**: - **Microsoft.Dotnet.Sdk.Internal**: [from 7.0.100-rtm.22479.5 to 7.0.100-rtm.22519.39][3] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22512.1][4] [3]:eb23d8c...e6dd91c
[4]:02d62cf...c686535
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <github-actions@xamarin.com> Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
This commit is contained in:
Родитель
6144ea4d78
Коммит
12f8af16c6
|
@ -638,6 +638,8 @@ DOTNET_BCL_DIR:=$(abspath $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL
|
|||
DOTNET_MANIFEST_VERSION_BAND=$(shell echo $(DOTNET_VERSION_BAND) | sed 's/..$$/00/')
|
||||
ifeq ($(DOTNET_VERSION_PRERELEASE_COMPONENT),)
|
||||
DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT=$(DOTNET_VERSION_BAND)
|
||||
else ifeq ($(word 1,$(subst ., ,$(DOTNET_VERSION_PRERELEASE_COMPONENT))),-rtm)
|
||||
DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT=$(DOTNET_VERSION_BAND)
|
||||
else
|
||||
DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT=$(DOTNET_VERSION_BAND)$(word 1,$(subst ., ,$(DOTNET_VERSION_PRERELEASE_COMPONENT))).$(word 2,$(subst ., ,$(DOTNET_VERSION_PRERELEASE_COMPONENT)))
|
||||
endif
|
||||
|
|
|
@ -78,11 +78,13 @@ DIRECTORIES += \
|
|||
$(DIRECTORIES):
|
||||
$(Q) mkdir -p $@
|
||||
|
||||
ifneq ($(DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT),$(DOTNET_MANIFEST_VERSION_BAND))
|
||||
.stamp-cp-mono-workload: $(TOP)/Make.config
|
||||
mkdir -p $(DOTNET_MANIFESTS_PATH)
|
||||
$(CP) -r $(DOTNET_MANIFESTS_PATH)/../$(DOTNET_MANIFEST_VERSION_BAND)/* $(DOTNET_MANIFESTS_PATH)/
|
||||
$(Q) touch $@
|
||||
TARGETS += .stamp-cp-mono-workload
|
||||
endif
|
||||
|
||||
CURRENT_HASH_LONG:=$(shell git log -1 --pretty=%H)
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rtm.22479.5">
|
||||
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rtm.22519.39">
|
||||
<Uri>https://github.com/dotnet/installer</Uri>
|
||||
<Sha>eb23d8cf9a11fd44bf8b07adf508bac6a9eae423</Sha>
|
||||
<Sha>e6dd91c290b808f971a1ac69c2fb29395bbf1051</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22471.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Uri>https://github.com/dotnet/linker</Uri>
|
||||
|
@ -13,9 +13,9 @@
|
|||
<Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha>
|
||||
</Dependency>
|
||||
<!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rtm.22479.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rtm.22512.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>02d62cfea1eaf37670d6f2f4bbceac3c24a357d0</Sha>
|
||||
<Sha>c6865355c01e1fb170b65427846d939559ab3789</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<Project>
|
||||
<!--Package versions-->
|
||||
<PropertyGroup>
|
||||
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rtm.22479.5</MicrosoftDotnetSdkInternalPackageVersion>
|
||||
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rtm.22519.39</MicrosoftDotnetSdkInternalPackageVersion>
|
||||
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22471.3</MicrosoftNETILLinkTasksPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
|
||||
<MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "7.0.100-rtm.22479.5"
|
||||
"version": "7.0.100-rtm.22519.39"
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче