From 2395be729f8ab39cc7c6d80b992bc04a03065c63 Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@btinternet.com>
Date: Fri, 28 Jul 2023 09:50:38 +0100
Subject: [PATCH 1/5] Move to Feedz

---
 MessagingService/Dockerfile        |  3 ---
 MessagingService/Dockerfilewindows |  3 ---
 MessagingService/NuGet.Config      | 10 +++++-----
 NuGet.Config                       | 24 ------------------------
 4 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 NuGet.Config

diff --git a/MessagingService/Dockerfile b/MessagingService/Dockerfile
index c94839b..31538fd 100644
--- a/MessagingService/Dockerfile
+++ b/MessagingService/Dockerfile
@@ -10,9 +10,6 @@ ARG NUGET_TOKEN
 
 WORKDIR /src
 COPY ["MessagingService/NuGet.Config", "."]
-# Replace the placeholders in the NuGet.config file with the GitHub Secret
-RUN sed -i "s|NUGET_TOKEN|${NUGET_TOKEN}|g" NuGet.Config
-
 COPY ["MessagingService/MessagingService.csproj", "MessagingService/"]
 COPY ["MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj", "MessagingService.BusinessLogic/"]
 COPY ["MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj", "MessagingService.EmailMessageAggregate/"]
diff --git a/MessagingService/Dockerfilewindows b/MessagingService/Dockerfilewindows
index e02c326..e454d1c 100644
--- a/MessagingService/Dockerfilewindows
+++ b/MessagingService/Dockerfilewindows
@@ -7,9 +7,6 @@ ARG NUGET_TOKEN
 
 WORKDIR /src
 COPY ["MessagingService/NuGet.Config", "."]
-# Replace the placeholders in the NuGet.config file with the GitHub Secret
-RUN powershell -Command "(Get-Content NuGet.Config) -replace 'NUGET_TOKEN', '${env:NUGET_TOKEN}' | Set-Content NuGet.Config"
-
 COPY ["MessagingService/MessagingService.csproj", "MessagingService/"]
 COPY ["MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj", "MessagingService.BusinessLogic/"]
 COPY ["MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj", "MessagingService.EmailMessageAggregate/"]
diff --git a/MessagingService/NuGet.Config b/MessagingService/NuGet.Config
index 7eec447..3086e20 100644
--- a/MessagingService/NuGet.Config
+++ b/MessagingService/NuGet.Config
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="GitHub" value="https://nuget.pkg.github.com/TransactionProcessing/index.json" />
+    <add key="Feedz" value="https://f.feedz.io/transactionprocessing/nugets/nuget/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
 	<packageSourceCredentials>
-		<GitHub>
-			<add key="Username" value="stuart_ferguson1development@outlook.com"/>
-			<add key="ClearTextPassword" value="NUGET_TOKEN" />
-    	</GitHub>
+		<Feedz>
+			<add key="Username" value="TestUser"/>
+			<add key="ClearTextPassword" value="T-jXeJSPLLjOdZvRZOQ5O2e1vrQwRI7uxC1U" />
+    	</Feedz>
 	</packageSourceCredentials>
   <packageRestore>
     <add key="enabled" value="True" />
diff --git a/NuGet.Config b/NuGet.Config
deleted file mode 100644
index 23979ac..0000000
--- a/NuGet.Config
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="GitHub" value="https://nuget.pkg.github.com/TransactionProcessing/index.json" />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-	<packageSourceCredentials>
-		<GitHub>
-			<add key="Username" value="stuart_ferguson1development@outlook.com"/>
-			<add key="ClearTextPassword" value="%GITHUBTOKEN%" />
-    	</GitHub>
-	</packageSourceCredentials>
-  <packageRestore>
-    <add key="enabled" value="True" />
-    <add key="automatic" value="True" />
-  </packageRestore>
-  <bindingRedirects>
-    <add key="skip" value="False" />
-  </bindingRedirects>
-  <packageManagement>
-    <add key="format" value="0" />
-    <add key="disabled" value="False" />
-  </packageManagement>
-</configuration>

From ecd3282409b2eeaffee525bb061f09a48c48e303 Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@btinternet.com>
Date: Fri, 28 Jul 2023 10:00:02 +0100
Subject: [PATCH 2/5] ..

---
 .github/workflows/pullrequest.yml | 2 --
 MessagingService/NuGet.Config     | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 1b044c2..aa4676f 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -17,8 +17,6 @@ jobs:
     - uses: actions/checkout@v2.3.4
 
     - name: Restore Nuget Packages
-      env:
-          GITHUBTOKEN: ${{ secrets.PRIVATEFEED_APIKEY }}
       run: dotnet restore MessagingService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
 
     - name: Build Code
diff --git a/MessagingService/NuGet.Config b/MessagingService/NuGet.Config
index 3086e20..a474dd6 100644
--- a/MessagingService/NuGet.Config
+++ b/MessagingService/NuGet.Config
@@ -7,7 +7,7 @@
 	<packageSourceCredentials>
 		<Feedz>
 			<add key="Username" value="TestUser"/>
-			<add key="ClearTextPassword" value="T-jXeJSPLLjOdZvRZOQ5O2e1vrQwRI7uxC1U" />
+			<add key="Password" value="T-jXeJSPLLjOdZvRZOQ5O2e1vrQwRI7uxC1U" />
     	</Feedz>
 	</packageSourceCredentials>
   <packageRestore>

From 2268d6e218fbc3c958504aa84bb67f7b97c3af97 Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@btinternet.com>
Date: Fri, 28 Jul 2023 10:01:47 +0100
Subject: [PATCH 3/5] .

---
 NuGet.Config | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 NuGet.Config

diff --git a/NuGet.Config b/NuGet.Config
new file mode 100644
index 0000000..a474dd6
--- /dev/null
+++ b/NuGet.Config
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="Feedz" value="https://f.feedz.io/transactionprocessing/nugets/nuget/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+	<packageSourceCredentials>
+		<Feedz>
+			<add key="Username" value="TestUser"/>
+			<add key="Password" value="T-jXeJSPLLjOdZvRZOQ5O2e1vrQwRI7uxC1U" />
+    	</Feedz>
+	</packageSourceCredentials>
+  <packageRestore>
+    <add key="enabled" value="True" />
+    <add key="automatic" value="True" />
+  </packageRestore>
+  <bindingRedirects>
+    <add key="skip" value="False" />
+  </bindingRedirects>
+  <packageManagement>
+    <add key="format" value="0" />
+    <add key="disabled" value="False" />
+  </packageManagement>
+</configuration>

From 102fcc4afd9c0e786dcfbb25c043873b860d7edf Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@btinternet.com>
Date: Fri, 28 Jul 2023 10:05:26 +0100
Subject: [PATCH 4/5] .

---
 MessagingService/NuGet.Config | 2 +-
 NuGet.Config                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MessagingService/NuGet.Config b/MessagingService/NuGet.Config
index a474dd6..3086e20 100644
--- a/MessagingService/NuGet.Config
+++ b/MessagingService/NuGet.Config
@@ -7,7 +7,7 @@
 	<packageSourceCredentials>
 		<Feedz>
 			<add key="Username" value="TestUser"/>
-			<add key="Password" value="T-jXeJSPLLjOdZvRZOQ5O2e1vrQwRI7uxC1U" />
+			<add key="ClearTextPassword" value="T-jXeJSPLLjOdZvRZOQ5O2e1vrQwRI7uxC1U" />
     	</Feedz>
 	</packageSourceCredentials>
   <packageRestore>
diff --git a/NuGet.Config b/NuGet.Config
index a474dd6..3086e20 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -7,7 +7,7 @@
 	<packageSourceCredentials>
 		<Feedz>
 			<add key="Username" value="TestUser"/>
-			<add key="Password" value="T-jXeJSPLLjOdZvRZOQ5O2e1vrQwRI7uxC1U" />
+			<add key="ClearTextPassword" value="T-jXeJSPLLjOdZvRZOQ5O2e1vrQwRI7uxC1U" />
     	</Feedz>
 	</packageSourceCredentials>
   <packageRestore>

From 1872f5ee8494381fcdc2ce16a169effe9bbc83cc Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@btinternet.com>
Date: Fri, 28 Jul 2023 10:21:08 +0100
Subject: [PATCH 5/5] update workflows

---
 .github/workflows/buildwindowsimage.yml | 4 ++--
 .github/workflows/createrelease.yml     | 6 ++----
 .github/workflows/nightlybuild.yml      | 4 +---
 .github/workflows/pushtomaster.yml      | 6 ++----
 .github/workflows/sonarcloud.yml        | 1 -
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/buildwindowsimage.yml b/.github/workflows/buildwindowsimage.yml
index 7340815..e0d5c5c 100644
--- a/.github/workflows/buildwindowsimage.yml
+++ b/.github/workflows/buildwindowsimage.yml
@@ -22,12 +22,12 @@ jobs:
     - name: Publish Images to Docker Hub - Pre Release
       if: ${{ github.event.release.prerelease == true }} 
       run: |
-        docker build . --file MessagingService/Dockerfilewindows --tag stuartferguson/messagingservicewindows:dev --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }}
+        docker build . --file MessagingService/Dockerfilewindows --tag stuartferguson/messagingservicewindows:dev
         docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
         docker push stuartferguson/messagingservicewindows:dev
     - name: Publish Images to Docker Hub - Formal Release
       if: ${{ github.event.release.prerelease == false }} 
       run: |
-        docker build . --file MessagingService/Dockerfilewindows --tag stuartferguson/messagingservicewindows:latest --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }}
+        docker build . --file MessagingService/Dockerfilewindows --tag stuartferguson/messagingservicewindows:latest
         docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
         docker push stuartferguson/messagingservicewindows:latest
diff --git a/.github/workflows/createrelease.yml b/.github/workflows/createrelease.yml
index 237a2f4..d649722 100644
--- a/.github/workflows/createrelease.yml
+++ b/.github/workflows/createrelease.yml
@@ -20,8 +20,6 @@ jobs:
       run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
 
     - name: Restore Nuget Packages
-      env:
-          GITHUBTOKEN: ${{ secrets.PRIVATEFEED_APIKEY }}
       run: dotnet restore MessagingService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
 
     - name: Build Code
@@ -37,14 +35,14 @@ jobs:
     - name: Publish Images to Docker Hub - Pre Release
       if: ${{ github.event.release.prerelease == true }} 
       run: |
-        docker build . --file MessagingService/Dockerfile --tag stuartferguson/messagingservice:dev --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }}
+        docker build . --file MessagingService/Dockerfile --tag stuartferguson/messagingservice:dev
         docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
         docker push stuartferguson/messagingservice:dev
 
     - name: Publish Images to Docker Hub - Formal Release
       if: ${{ github.event.release.prerelease == false }} 
       run: |
-        docker build . --file MessagingService/Dockerfile --tag stuartferguson/messagingservice:latest --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }}
+        docker build . --file MessagingService/Dockerfile --tag stuartferguson/messagingservice:latest
         docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
         docker push stuartferguson/messagingservice:latest
 
diff --git a/.github/workflows/nightlybuild.yml b/.github/workflows/nightlybuild.yml
index 3f2ea0b..7a159f0 100644
--- a/.github/workflows/nightlybuild.yml
+++ b/.github/workflows/nightlybuild.yml
@@ -46,8 +46,6 @@ jobs:
       run: echo "action_url=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> $GITHUB_ENV
 
     - name: Restore Nuget Packages
-      env:
-          GITHUBTOKEN: ${{ secrets.PRIVATEFEED_APIKEY }}
       run: dotnet restore MessagingService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
 
     - name: Build Code
@@ -70,7 +68,7 @@ jobs:
         files: ./lcov1.info,./lcov2.info,./lcov3.info,./lcov4.info
 
     - name: Build Docker Image
-      run: docker build . --file MessagingService/Dockerfile --tag messagingservice:latest --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }}
+      run: docker build . --file MessagingService/Dockerfile --tag messagingservice:latest
         
     - name: Run Integration Tests
       run: dotnet test "MessagingService.IntegrationTests\MessagingService.IntegrationTests.csproj"
diff --git a/.github/workflows/pushtomaster.yml b/.github/workflows/pushtomaster.yml
index 2c6a077..dd3111b 100644
--- a/.github/workflows/pushtomaster.yml
+++ b/.github/workflows/pushtomaster.yml
@@ -20,8 +20,6 @@ jobs:
         fetch-depth: 0
 
     - name: Restore Nuget Packages
-      env:
-          GITHUBTOKEN: ${{ secrets.PRIVATEFEED_APIKEY }}
       run: dotnet restore MessagingService.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
 
     - name: Build Code
@@ -53,7 +51,7 @@ jobs:
 
     - name: Publish Images to Docker Hub
       run: |
-        docker build . --file MessagingService/Dockerfile --tag stuartferguson/messagingservice:master --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }}
+        docker build . --file MessagingService/Dockerfile --tag stuartferguson/messagingservice:master
         docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
         docker push stuartferguson/messagingservice:master
 
@@ -71,6 +69,6 @@ jobs:
 
     - name: Publish Windows Images to Docker Hub
       run: |
-        docker build . --file MessagingService/Dockerfilewindows --tag stuartferguson/messagingservicewindows:master --build-arg NUGET_TOKEN=${{ secrets.PRIVATEFEED_APIKEY }}
+        docker build . --file MessagingService/Dockerfilewindows --tag stuartferguson/messagingservicewindows:master
         docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
         docker push stuartferguson/messagingservicewindows:master
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 40191bf..80eedfc 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -43,7 +43,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          GITHUBTOKEN: ${{ secrets.PRIVATEFEED_APIKEY }}
         shell: powershell
         run: |
           .\.sonar\scanner\dotnet-sonarscanner begin /k:"TransactionProcessing_Messaging" /o:"transactionprocessing" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"