From c41d30d2965fa8f50c84798f21bd1baef3d5bf8d Mon Sep 17 00:00:00 2001
From: Tomas Matousek <tomat@microsoft.com>
Date: Thu, 21 Feb 2019 10:59:17 -0800
Subject: [PATCH] Set copyright and package license

---
 Directory.Build.props | 20 ++++++++------------
 eng/Versions.props    |  9 +++++++++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 30a818317..16958b290 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <!-- Leave this file here, even if it's empty. It stops chaining imports. -->
-  <PropertyGroup>
-    <ImportNetSdkFromRepoToolset>false</ImportNetSdkFromRepoToolset>
 
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)eng\AspNetCore.snk</AssemblyOriginatorKeyFile>
-    <LangVersion>7.3</LangVersion>
-  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
+  <PropertyGroup Condition="'$(CopyrightMicrosoft)' != ''">
+    <Copyright>$(CopyrightMicrosoft)</Copyright>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+  </PropertyGroup>
+ 
   <PropertyGroup>
-      <!-- <RestoreSources>$(RestoreSources);http://api.nuget.org/v3/index.json;</RestoreSources> -->
-
-      <!-- aspnetcore-dev feed for internal packages like Microsoft.Extensions.Logging.Testing -->
-      <RestoreSources>$(RestoreSources);https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</RestoreSources>
-      <RestoreSources>$(RestoreSources);https://dotnet.myget.org/F/dotnet-core/api/v3/index.json</RestoreSources>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)eng\AspNetCore.snk</AssemblyOriginatorKeyFile>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Package and Assembly Metadata">
@@ -27,6 +25,4 @@
     -->
     <NoWarn>$(NoWarn);NU5125</NoWarn>
   </PropertyGroup>
-
-  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 </Project>
diff --git a/eng/Versions.props b/eng/Versions.props
index 632e14eec..16d105b33 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,4 +10,13 @@
     <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
     <PreReleaseVersionLabel Condition="'$(MSBuildProjectName)' == 'Microsoft.HttpRepl'">preview</PreReleaseVersionLabel>
   </PropertyGroup>
+  <PropertyGroup>
+    <RestoreSources>
+      $(RestoreSources);
+      https://www.myget.org/F/anurse-clrmd/api/v3/index.json
+      <!-- aspnetcore-dev feed for internal packages like Microsoft.Extensions.Logging.Testing -->
+      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
+      https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
+    </RestoreSources>
+  </PropertyGroup>
 </Project>