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

[main] Update dependencies from dotnet/source-build-externals (#19097)

Browse source 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: JL03-Yue <59816815+JL03-Yue@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2024-03-20 07:47:42 +00:00 committed by GitHub
parent e22bf5e53d
commit 82099924ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -226,9 +226,9 @@
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24162.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24168.3">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>3167c0a9379f52145af31057aca31f45528eb123</Sha>
<Sha>b46b7e6859f4094cd7f3e00dc0471d62f5d8d051</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.24126.1" CoherentParentDependency="Microsoft.NET.Sdk">

42
src/SourceBuild/patches/source-build-externals/0001-Enable-publishing-in-VMR.patch
View file

@ -1,42 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Thu, 7 Mar 2024 22:10:43 +0000
Subject: [PATCH] Enable publishing in VMR
Backport: https://github.com/dotnet/source-build-externals/pull/275
---
eng/Publishing.props | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/eng/Publishing.props b/eng/Publishing.props
index d3aa836..3629bb8 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -2,5 +2,27 @@
<Project>
<PropertyGroup>
<PublishingVersion>3</PublishingVersion>
+ <PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishPackages</PublishDependsOnTargets>
</PropertyGroup>
+
+ <ItemGroup>
+ <_PackagesToPublish Remove="@(_PackagesToPublish)" />
+ <_PackagesToPublish Include="$(ArtifactsPackagesDir)**\*.nupkg" UploadPathSegment="Runtime" Condition="'$(DotNetBuildRepo)' == 'true'" />
+ </ItemGroup>
+
+ <Target Name="_PublishPackages">
+ <ItemGroup>
+ <!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows.
+ Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
+ the nupkgs pushed. Do not do this if building from source, since we want the source build intermediate package
+ to be published. Use DotNetBuildRepo as DotNetBuildFromSource is only set in the internal source build,
+ and Build.proj is invoked from the wrapper build. -->
+ <ItemsToPushToBlobFeed Remove="@(ItemsToPushToBlobFeed)" Condition="'$(OS)' != 'Windows_NT' and '$(PostBuildSign)' != 'true' and '$(DotNetBuildRepo)' != 'true'" />
+
+ <ItemsToPushToBlobFeed Include="@(_PackagesToPublish)">
+ <IsShipping>true</IsShipping>
+ </ItemsToPushToBlobFeed>
+ </ItemGroup>
+ </Target>
+
</Project>