Remove windowsdesktop patch
This commit is contained in:
parent
691ebd435d
commit
ec7371000d
1 changed files with 0 additions and 57 deletions
|
@ -1,57 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
||||
Date: Thu, 7 Mar 2024 22:19:59 +0000
|
||||
Subject: [PATCH] Enable publishing in VMR
|
||||
|
||||
Backport: https://github.com/dotnet/windowsdesktop/pull/4215
|
||||
---
|
||||
eng/Publishing.props | 40 ++++++++++++++++++++++++++++++++++++----
|
||||
1 file changed, 36 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/eng/Publishing.props b/eng/Publishing.props
|
||||
index a2ad9884..0426da4f 100644
|
||||
--- a/eng/Publishing.props
|
||||
+++ b/eng/Publishing.props
|
||||
@@ -1,5 +1,37 @@
|
||||
<Project>
|
||||
- <PropertyGroup>
|
||||
- <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
|
||||
- </PropertyGroup>
|
||||
-</Project>
|
||||
\ No newline at end of file
|
||||
+
|
||||
+ <PropertyGroup>
|
||||
+ <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
|
||||
+ <PublishDependsOnTargets>$(PublishDependsOnTargets);_PublishInstallers</PublishDependsOnTargets>
|
||||
+ </PropertyGroup>
|
||||
+
|
||||
+ <ItemGroup>
|
||||
+ <_InstallersToPublish Remove="@(_InstallersToPublish)" />
|
||||
+ <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.zip" UploadPathSegment="WindowsDesktop" Condition="'$(DotNetBuildRepo)' == 'true'" />
|
||||
+ <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.exe" UploadPathSegment="WindowsDesktop" Condition="'$(DotNetBuildRepo)' == 'true'" />
|
||||
+ <_InstallersToPublish Include="$(ArtifactsPackagesDir)**\*.msi" UploadPathSegment="WindowsDesktop" Condition="'$(DotNetBuildRepo)' == 'true'" />
|
||||
+ </ItemGroup>
|
||||
+
|
||||
+ <Target Name="_PublishInstallers">
|
||||
+
|
||||
+ <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'" />
|
||||
+
|
||||
+ <!--
|
||||
+ MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion is x64 version - there is no Rid-specific property.
|
||||
+ TODO: This will need to be updated to support arm64.
|
||||
+ -->
|
||||
+ <ItemsToPushToBlobFeed Include="@(_InstallersToPublish)">
|
||||
+ <ManifestArtifactData>NonShipping=false</ManifestArtifactData>
|
||||
+ <PublishFlatContainer>true</PublishFlatContainer>
|
||||
+ <RelativeBlobPath>%(_InstallersToPublish.UploadPathSegment)/$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)/%(Filename)%(Extension)</RelativeBlobPath>
|
||||
+ </ItemsToPushToBlobFeed>
|
||||
+ </ItemGroup>
|
||||
+ </Target>
|
||||
+
|
||||
+</Project>
|
Loading…
Reference in a new issue