[main] Update dependencies from dotnet/installer (#14691)
* Update dependencies from https://github.com/dotnet/installer build 20220406.8 Microsoft.Dotnet.Sdk.Internal From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-preview.22206.8 * Update dependencies from https://github.com/dotnet/installer build 20220407.16 Microsoft.Dotnet.Sdk.Internal From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-preview.22207.16 * Update dependencies from https://github.com/dotnet/installer build 20220408.1 Microsoft.Dotnet.Sdk.Internal From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-preview.22208.1 * Update dependencies from https://github.com/dotnet/installer build 20220409.1 Microsoft.Dotnet.Sdk.Internal From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-preview.22209.1 * Update dependencies from https://github.com/dotnet/installer build 20220411.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-preview.22211.2 * Update dependencies from https://github.com/dotnet/installer build 20220412.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-preview.22212.2 * Update dependencies from https://github.com/dotnet/installer build 20220412.25 Microsoft.Dotnet.Sdk.Internal From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-preview.22212.25 * Update dependencies from https://github.com/dotnet/installer build 20220413.48 Microsoft.Dotnet.Sdk.Internal From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-rtm.22213.48 Dependency coherency updates Microsoft.AspNetCore.App.Ref From Version 6.0.3 -> To Version 6.0.4 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20220414.7 Microsoft.Dotnet.Sdk.Internal From Version 6.0.300-preview.22205.8 -> To Version 6.0.300-rtm.22214.7 Dependency coherency updates Microsoft.AspNetCore.App.Ref From Version 6.0.3 -> To Version 6.0.4 (parent: Microsoft.Dotnet.Sdk.Internal * Find .NET's csc compiler. Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Manuel de la Pena <mandel@microsoft.com> Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
This commit is contained in:
Родитель
fd3112e7f7
Коммит
d53c374d21
|
@ -594,7 +594,12 @@ TOOLCHAIN_MANIFEST_VERSION_BAND=6.0.200
|
||||||
DOTNET_CSC_PATH_PREVIEW=$(DOTNET_DIR)/sdk/$(DOTNET_VERSION)/Roslyn/bincore/csc.dll
|
DOTNET_CSC_PATH_PREVIEW=$(DOTNET_DIR)/sdk/$(DOTNET_VERSION)/Roslyn/bincore/csc.dll
|
||||||
DOTNET_CSC_PATH_STABLE=$(DOTNET_DIR)/sdk/$(DOTNET_VERSION_BAND)/Roslyn/bincore/csc.dll
|
DOTNET_CSC_PATH_STABLE=$(DOTNET_DIR)/sdk/$(DOTNET_VERSION_BAND)/Roslyn/bincore/csc.dll
|
||||||
|
|
||||||
|
# Attempt to detect where csc is based on the .NET version. This may fail in the future: feel free to fix/hardcode whatever's necessary to find csc.dll.
|
||||||
|
ifeq (rtm,$(findstring rtm,$(DOTNET_VERSION)))
|
||||||
|
DOTNET_CSC=$(DOTNET) exec $(DOTNET_CSC_PATH_STABLE)
|
||||||
|
else
|
||||||
DOTNET_CSC=$(DOTNET) exec $(DOTNET_CSC_PATH_PREVIEW)
|
DOTNET_CSC=$(DOTNET) exec $(DOTNET_CSC_PATH_PREVIEW)
|
||||||
|
endif
|
||||||
|
|
||||||
# How are our assemblies named?
|
# How are our assemblies named?
|
||||||
DOTNET_IOS_ASSEMBLY_NAME=Microsoft.iOS
|
DOTNET_IOS_ASSEMBLY_NAME=Microsoft.iOS
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<Dependencies>
|
<Dependencies>
|
||||||
<ProductDependencies>
|
<ProductDependencies>
|
||||||
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.300-preview.22205.8">
|
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.300-rtm.22214.7">
|
||||||
<Uri>https://github.com/dotnet/installer</Uri>
|
<Uri>https://github.com/dotnet/installer</Uri>
|
||||||
<Sha>dec32fa62c24bdd5f4887bfe7d61c0b93c958b18</Sha>
|
<Sha>04e40fa940291c528688bb46a1aa0e6efdbab7cf</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22178.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22178.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||||
<Uri>https://github.com/dotnet/linker</Uri>
|
<Uri>https://github.com/dotnet/linker</Uri>
|
||||||
|
@ -13,9 +13,9 @@
|
||||||
<Sha>a21b9a2dd4c31cf5bd37626562b7612faf21cee6</Sha>
|
<Sha>a21b9a2dd4c31cf5bd37626562b7612faf21cee6</Sha>
|
||||||
</Dependency>
|
</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 -->
|
<!-- 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="6.0.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
|
||||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||||
<Sha>c911002ab43b7b989ed67090f2a48d9073d5118d</Sha>
|
<Sha>f9ae0f5d30be2de3c0de61b5673bd8873231d70a</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<Project>
|
<Project>
|
||||||
<!--Package versions-->
|
<!--Package versions-->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<MicrosoftDotnetSdkInternalPackageVersion>6.0.300-preview.22205.8</MicrosoftDotnetSdkInternalPackageVersion>
|
<MicrosoftDotnetSdkInternalPackageVersion>6.0.300-rtm.22214.7</MicrosoftDotnetSdkInternalPackageVersion>
|
||||||
<MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22178.2</MicrosoftNETILLinkTasksPackageVersion>
|
<MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22178.2</MicrosoftNETILLinkTasksPackageVersion>
|
||||||
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
|
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
|
||||||
<MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
|
<MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче