From 530bc154fd331b3beab935a2bae814e067c110f7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Fri, 20 Sep 2019 17:27:15 +0200
Subject: [PATCH] [netcore] Move to new arcade post build using yaml stages
 (mono/mono#16966)

This is required by the newer arcade builds.
We can simplify our scripts since we no longer need the special publishwitharcade.proj.

Added copyright and license to the .nuspecs since the new arcade validation now
verifies this against a set of Microsoft policies.

We also need to make the .nupkg pre-release by appending the -preview suffix as stable versions are not permitted in non-stable feeds.


Commit migrated from https://github.com/mono/mono/commit/6bc988b0870b7d4d56a73c13b45fe5158f81c64d
---
 eng/{empty.proj => empty.csproj}         |  0
 eng/publishwitharcade.proj               | 51 --------------------------------
 src/mono/netcore/Makefile                |  2 +-
 src/mono/netcore/metapackage-llvm.nuspec |  2 ++
 src/mono/netcore/metapackage.nuspec      |  2 ++
 src/mono/netcore/runtime-llvm.nuspec     |  2 ++
 src/mono/netcore/runtime.nuspec          |  2 ++
 7 files changed, 9 insertions(+), 52 deletions(-)
 rename eng/{empty.proj => empty.csproj} (100%)
 delete mode 100644 eng/publishwitharcade.proj

diff --git a/eng/empty.proj b/eng/empty.csproj
similarity index 100%
rename from eng/empty.proj
rename to eng/empty.csproj
diff --git a/eng/publishwitharcade.proj b/eng/publishwitharcade.proj
deleted file mode 100644
index bbadd12..0000000
--- a/eng/publishwitharcade.proj
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project DefaultTargets="PublishPackages">
-
-  <!-- TODO: move properties imported from here into a common props file -->
-  <!-- <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> -->
-
-  <!-- Use an explicit SDK import so that arcade uses the build
-       configuration computed in dir.common.props. -->
-  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-
-  <Import Project="$(MSBuildThisFileDirectory)\..\.packages\microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" />
-
-  <PropertyGroup>
-    <!-- Set the TargetFramework just to make the SDK happy -->
-    <TargetFramework>net462</TargetFramework>
-  </PropertyGroup>
-
-  <Target Name="PublishPackages">
-
-    <ItemGroup>
-      <PackagesToPublish Include="$(MSBuildThisFileDirectory)\..\artifacts\*.nupkg" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ItemsToPushToBlobFeed Include="@(PackagesToPublish)" />
-    </ItemGroup>
-
-    <Error Condition=" '$(AzureFeedUrl)' == '' " Text="AzureFeedUrl must be set" />
-    <Error Condition=" '$(AzureAccountKey)' == '' " Text="AzureAccountKey must be set" />
-    <Error Condition=" '$(BUILD_REPOSITORY_URI)' == '' " Text="BUILD_REPOSITORY_URI must be set" />
-    <Error Condition=" '$(BUILD_SOURCEBRANCH)' == '' " Text="BUILD_SOURCEBRANCH must be set" />
-    <Error Condition=" '$(BUILD_BUILDNUMBER)' == '' " Text="BUILD_BUILDNUMBER must be set" />
-    <Error Condition=" '$(BUILD_SOURCEVERSION)' == '' " Text="BUILD_SOURCEVERSION must be set" />
-
-    <PropertyGroup>
-      <AssetManifestFilePath>$(ArtifactsLogDir)AssetManifest\$(AssetManifest)</AssetManifestFilePath>
-    </PropertyGroup>
-
-    <Message Importance="Low" Text="BUILD_REPOSITORY_URI: $(BUILD_REPOSITORY_URI)" />
-
-    <PushToBlobFeed ExpectedFeedUrl="$(AzureFeedUrl)"
-                    AccountKey="$(AzureAccountKey)"
-                    ItemsToPush="@(ItemsToPushToBlobFeed)"
-                    ManifestBuildData="Location=$(AzureFeedUrl)"
-                    ManifestRepoUri="$(BUILD_REPOSITORY_URI)"
-                    ManifestBranch="$(BUILD_SOURCEBRANCH)"
-                    ManifestBuildId="$(BUILD_BUILDNUMBER)"
-                    ManifestCommit="$(BUILD_SOURCEVERSION)"
-                    AssetManifestPath="$(AssetManifestFilePath)" />
-  </Target>
-
-</Project>
diff --git a/src/mono/netcore/Makefile b/src/mono/netcore/Makefile
index 34e71eb..d26f80d 100644
--- a/src/mono/netcore/Makefile
+++ b/src/mono/netcore/Makefile
@@ -52,7 +52,7 @@ TEST_ASSETS_PATH := corefx-tests/$(NETCORETESTS_VERSION)/$(TESTS_PLATFORM)/netco
 
 # used to calculate exact version number for generating nupkg
 BLAME = $(shell git blame ../configure.ac | grep AC_INIT | cut -f1 -d' ')
-VERSTUB = .$(shell git rev-list --count $(BLAME)..HEAD)
+VERSTUB = .$(shell git rev-list --count $(BLAME)..HEAD)-preview
 
 all: bcl
 
diff --git a/src/mono/netcore/metapackage-llvm.nuspec b/src/mono/netcore/metapackage-llvm.nuspec
index cb0f161..e1babad 100644
--- a/src/mono/netcore/metapackage-llvm.nuspec
+++ b/src/mono/netcore/metapackage-llvm.nuspec
@@ -6,7 +6,9 @@
         <description>Internal implementation package not meant for direct consumption.  Please do not reference directly. 
 The Mono runtime, and the base library, called mscorlib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.</description>
         <authors>Microsoft</authors>
+        <copyright>(c) Microsoft Corporation. All rights reserved.</copyright>
         <projectUrl>https://www.mono-project.com/</projectUrl>
+        <licenseUrl>https://github.com/mono/mono/blob/master/LICENSE</licenseUrl>
         <dependencies>
             <dependency id="runtime.linux-x64.Microsoft.NETCore.Runtime.MonoLLVM" version="$VERSION$" />
         </dependencies>
diff --git a/src/mono/netcore/metapackage.nuspec b/src/mono/netcore/metapackage.nuspec
index 97d722a..55fce5b 100644
--- a/src/mono/netcore/metapackage.nuspec
+++ b/src/mono/netcore/metapackage.nuspec
@@ -6,7 +6,9 @@
         <description>Internal implementation package not meant for direct consumption.  Please do not reference directly. 
 The Mono runtime, and the base library, called mscorlib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.</description>
         <authors>Microsoft</authors>
+        <copyright>(c) Microsoft Corporation. All rights reserved.</copyright>
         <projectUrl>https://www.mono-project.com/</projectUrl>
+        <licenseUrl>https://github.com/mono/mono/blob/master/LICENSE</licenseUrl>
         <dependencies>
             <dependency id="runtime.win-x64.Microsoft.NETCore.Runtime.Mono" version="$VERSION$" />
             <dependency id="runtime.osx-x64.Microsoft.NETCore.Runtime.Mono" version="$VERSION$" />
diff --git a/src/mono/netcore/runtime-llvm.nuspec b/src/mono/netcore/runtime-llvm.nuspec
index 558a5c3..0939580 100644
--- a/src/mono/netcore/runtime-llvm.nuspec
+++ b/src/mono/netcore/runtime-llvm.nuspec
@@ -6,7 +6,9 @@
         <description>Internal implementation package not meant for direct consumption.  Please do not reference directly. 
 The Mono runtime, and the base library, called mscorlib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.</description>
         <authors>Microsoft</authors>
+        <copyright>(c) Microsoft Corporation. All rights reserved.</copyright>
         <projectUrl>https://www.mono-project.com/</projectUrl>
+        <licenseUrl>https://github.com/mono/mono/blob/master/LICENSE</licenseUrl>
     </metadata>
     <files>
         <file src="System.Private.CoreLib\bin\$COREARCH$\System.Private.CoreLib.dll" target="runtimes\$RID$\native" />
diff --git a/src/mono/netcore/runtime.nuspec b/src/mono/netcore/runtime.nuspec
index 2cbf5f6..b351c670 100644
--- a/src/mono/netcore/runtime.nuspec
+++ b/src/mono/netcore/runtime.nuspec
@@ -6,7 +6,9 @@
         <description>Internal implementation package not meant for direct consumption.  Please do not reference directly. 
 The Mono runtime, and the base library, called mscorlib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.</description>
         <authors>Microsoft</authors>
+        <copyright>(c) Microsoft Corporation. All rights reserved.</copyright>
         <projectUrl>https://www.mono-project.com/</projectUrl>
+        <licenseUrl>https://github.com/mono/mono/blob/master/LICENSE</licenseUrl>
     </metadata>
     <files>
         <file src="System.Private.CoreLib\bin\$COREARCH$\System.Private.CoreLib.dll" target="runtimes\$RID$\native" />
-- 
2.7.4