From f4ca51b1505c8bb85c83b153ccba8edb31929768 Mon Sep 17 00:00:00 2001
From: Alexander Imra <avimra@gmail.com>
Date: Thu, 23 Jul 2020 16:20:10 -0700
Subject: [PATCH 1/2] Use the user name and password for publishing packages
 instead of an API key

---
 Publish/NuGetPublish.csproj        | 8 +++++---
 User.Directory.Build.props.example | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Publish/NuGetPublish.csproj b/Publish/NuGetPublish.csproj
index 5d39353dbe..801af7dc46 100644
--- a/Publish/NuGetPublish.csproj
+++ b/Publish/NuGetPublish.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <NoBuild>true</NoBuild>
@@ -20,7 +20,8 @@
   <!-- Force Release Configuration build and check env variables / User.Directory.Build.props -->
   <Target Name="_CheckConfiguration" BeforeTargets="CoreBuild">
     <Error Condition="'$(Configuration)' != 'Release'" Text="You should build this project only in 'Release' configuration. Use `dotnet build -c Release`" />
-    <Error Condition="'$(DoNugetFeedApiKey)' == ''" Text="You should set 'DoNugetFeedApiKey' property in User.Directory.Build.props or in env variable" />
+    <Error Condition="'$(DoNugetFeedUserName)' == ''" Text="You should set 'DoNugetFeedUserName' property in User.Directory.Build.props or in env variable" />
+    <Error Condition="'$(DoNugetFeedPassword)' == ''" Text="You should set 'DoNugetFeedPassword' property in User.Directory.Build.props or in env variable" />
     <Error Condition="'$(DoNugetFeedUrl)' == ''" Text="You should set 'DoNugetFeedUrl' property in User.Directory.Build.props or in env variable" />
   </Target>
 
@@ -51,6 +52,7 @@
   <!-- If package-lock.json has changed, perform an NPM install -->
   <Target Name="PublishToNuget" AfterTargets="Pack" DependsOnTargets="Pack">
     <Message Importance="high" Text="Publish nupkg %(NugetPublishInput.Identity) to server" />
-    <Exec Command="dotnet nuget push %(NugetPublishInput.Identity) --force-english-output --timeout 60 --api-key $(DoNugetFeedApiKey) --source $(DoNugetFeedUrl)" WorkingDirectory="$(SolutionDir)_Build\Release\packages" />
+    <Exec Command="dotnet nuget add source $(DoNugetFeedUrl) --username $(DoNugetFeedUserName) --password $(DoNugetFeedPassword) --store-password-in-clear-text" WorkingDirectory="$(SolutionDir)_Build\Release\packages" />
+    <Exec Command="dotnet nuget push %(NugetPublishInput.Identity) --force-english-output --timeout 60 --api-key az --source $(DoNugetFeedUrl)" WorkingDirectory="$(SolutionDir)_Build\Release\packages" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/User.Directory.Build.props.example b/User.Directory.Build.props.example
index 34a2b57189..b2dbd69797 100644
--- a/User.Directory.Build.props.example
+++ b/User.Directory.Build.props.example
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="latest">
   <PropertyGroup Label="User defined variables">
-    <DoNugetFeedApiKey>Put key Here</DoNugetFeedApiKey>
+    <DoNugetFeedUserName>Put username here</DoNugetFeedUserName>
+    <DoNugetFeedPassword>Put password here</DoNugetFeedPassword>
     <DoNugetFeedUrl>Put url here</DoNugetFeedUrl>
   </PropertyGroup>
 </Project>

From a71049c07002ec36f21415111deb98d5fd892e2b Mon Sep 17 00:00:00 2001
From: Alexander Imra <avimra@gmail.com>
Date: Fri, 24 Jul 2020 00:14:01 -0700
Subject: [PATCH 2/2] Create/overwrite NuGet.Config file before publishing and
 delete after this.

---
 Publish/NuGetPublish.csproj | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Publish/NuGetPublish.csproj b/Publish/NuGetPublish.csproj
index 801af7dc46..8d2919c184 100644
--- a/Publish/NuGetPublish.csproj
+++ b/Publish/NuGetPublish.csproj
@@ -52,7 +52,11 @@
   <!-- If package-lock.json has changed, perform an NPM install -->
   <Target Name="PublishToNuget" AfterTargets="Pack" DependsOnTargets="Pack">
     <Message Importance="high" Text="Publish nupkg %(NugetPublishInput.Identity) to server" />
-    <Exec Command="dotnet nuget add source $(DoNugetFeedUrl) --username $(DoNugetFeedUserName) --password $(DoNugetFeedPassword) --store-password-in-clear-text" WorkingDirectory="$(SolutionDir)_Build\Release\packages" />
+    <!-- Create empty valid NuGet.Config file and add credentials there -->
+    <WriteLinesToFile File="$(SolutionDir)_Build\Release\packages\NuGet.Config" Lines="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;configuration&gt;&lt;/configuration&gt;" Overwrite="True" />
+    <Exec Command="dotnet nuget add source $(DoNugetFeedUrl) --username $(DoNugetFeedUserName) --password $(DoNugetFeedPassword) --store-password-in-clear-text --configfile NuGet.Config" WorkingDirectory="$(SolutionDir)_Build\Release\packages" />
+    <!-- Push packages using credentials from NuGet.Config file and then delete NuGet.Config  -->
     <Exec Command="dotnet nuget push %(NugetPublishInput.Identity) --force-english-output --timeout 60 --api-key az --source $(DoNugetFeedUrl)" WorkingDirectory="$(SolutionDir)_Build\Release\packages" />
+    <Delete Files="$(SolutionDir)_Build\Release\packages\NuGet.Config" />
   </Target>
 </Project>
\ No newline at end of file