mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[main] Update dependencies from dotnet/sdk (#16471)

Browse source 
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.5.23272.4 to 8.0.0-preview.5.23272.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 8.0.0-preview.5.23272.4 to 8.0.0-preview.5.23272.14 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.5.23272.4 to 8.0.0-preview.5.23272.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.5.23272.4 to 8.0.0-preview.5.23272.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.5.23272.4 to 8.0.0-preview.5.23272.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 8.0.0-preview.5.23272.4 to 8.0.0-preview.5.23272.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.5.23272.6 to 8.0.0-preview.5.23272.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.5.23272.6 to 8.0.0-preview.5.23272.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.5.23272.6 to 8.0.0-preview.5.23272.16 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.5.23272.6 to 8.0.0-preview.5.23272.16 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-preview.5.23272.6 to 8.0.0-preview.5.23272.16 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-preview.5.23272.6 to 8.0.0-preview.5.23272.16 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-preview.5.23272.6 to 8.0.0-preview.5.23272.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.5.23272.4 to 8.0.0-preview.5.23272.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.7.0-2.23271.1 to 4.7.0-2.23272.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.5.23272.4 to 8.0.0-preview.5.23272.14 (parent: Microsoft.NET.Sdk)

 - Merge branch 'main' into darc-main-1526ed1d-2ba6-4a46-b95c-5f4c7ce0323b

 - Remove backported roslyn patch

 - Remove backported Roslyn patch
This commit is contained in:
dotnet-maestro[bot] 2023-05-23 16:56:10 +00:00 • committed by GitHub
parent 0016cea7f9
commit 441d27fc63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/SourceBuild/patches/roslyn/0001-Only-pack-the-shipping-non-shipping-nupkgs-for-rosly.patch
View file

@ -1,38 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Thu, 6 Apr 2023 19:53:04 +0000
Subject: [PATCH] Only pack the shipping/non-shipping nupkgs for roslyn
Avoid packing release, pre-release stable nupkgs, and symbol nupkg.
Backport: https://github.com/dotnet/roslyn/pull/67679
---
eng/SourceBuild.props | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index d5d41e7167e..a8b55f352ad 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -4,8 +4,21 @@
<GitHubRepositoryName>roslyn</GitHubRepositoryName>
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
<SourceBuildTrimNetFrameworkTargets>true</SourceBuildTrimNetFrameworkTargets>
+ <!-- Roslyn produces stable release branded and stable pre-release branded artifacts in addition to the normal non-stable artifacts.
+ Only the non-stable artifacts should flow downstream in source build -->
+ <EnableDefaultSourceBuildIntermediateItems>false</EnableDefaultSourceBuildIntermediateItems>
</PropertyGroup>
+ <Target Name="GetCustomIntermediateNupkgContents" BeforeTargets="GetCategorizedIntermediateNupkgContents">
+ <ItemGroup>
+ <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\**\*.nupkg" />
+ <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)NonShipping\**\*.nupkg" />
+ <!-- Don't pack any symbol packages: not needed for downstream source-build CI.
+ Roslyn's symbol packages come in .Symbols.<version>.nupkg instead of the standard format. -->
+ <IntermediateNupkgArtifactFile Remove="$(CurrentRepoSourceBuildArtifactsPackagesDir)**\*.Symbols.*.nupkg" />
+ </ItemGroup>
+ </Target>
+
<!--
The build script passes in the full path of the sln to build. This must be overridden in order to build
the cloned source in the inner build.

26
src/SourceBuild/patches/roslyn/0002-Do-not-specify-ref-pack-versions.patch
View file

@ -1,26 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Fri, 19 May 2023 21:54:50 +0000
Subject: [PATCH] Do not specify ref-pack versions
Backport: https://github.com/dotnet/roslyn/pull/67895
---
eng/targets/Imports.BeforeArcade.targets | 2 --
1 file changed, 2 deletions(-)
diff --git a/eng/targets/Imports.BeforeArcade.targets b/eng/targets/Imports.BeforeArcade.targets
index 968ecd42a6e..aeb820317be 100644
--- a/eng/targets/Imports.BeforeArcade.targets
+++ b/eng/targets/Imports.BeforeArcade.targets
@@ -17,11 +17,9 @@
<ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
<KnownFrameworkReference Update="Microsoft.NETCore.App">
<TargetingPackVersion Condition="'%(TargetFramework)' == 'net6.0'">6.0.0</TargetingPackVersion>
- <TargetingPackVersion Condition="'%(TargetFramework)' == 'net8.0'">8.0.0-preview.3.23165.3</TargetingPackVersion>
</KnownFrameworkReference>
<KnownFrameworkReference Update="Microsoft.AspNetCore.App">
<TargetingPackVersion Condition="'%(TargetFramework)' == 'net6.0'">6.0.0</TargetingPackVersion>
- <TargetingPackVersion Condition="'%(TargetFramework)' == 'net8.0'">8.0.0-preview.3.23164.14</TargetingPackVersion>
</KnownFrameworkReference>
</ItemGroup>