fix: or-1566 use paket for build pipeline only

Informatievlaanderen · Jun 6, 2024 · 37a65f4 · 37a65f4
1 parent 17fc59d
commit 37a65f4
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 18 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -6,7 +6,15 @@
       "version": "5.9.0",
       "commands": [
         "dotnet-lambda"
-      ]
+      ],
+      "rollForward": false
+    },
+    "paket": {
+      "version": "8.0.3",
+      "commands": [
+        "paket"
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -543,19 +543,14 @@ jobs:
       - name: Restore dotnet restore
         shell: bash
         run: |
-          dotnet restore
-          
-      - name: Show folder output
-        shell: bash
-        run: |
-          ls -alR          
+          dotnet tool install paket
+          dotnet paket restore
 
       - name: Publish to Confluence
         if: needs.set-release-version.outputs.version != 'none'
         shell: bash
         run: |
-          sed -i 's/packages\/Be\.Vlaanderen\.Basisregisters\.Build\.Pipeline\/Content\/ci-md2conf/packages\/be\.vlaanderen\.basisregisters\.build\.pipeline\/7.2.6\/Content\/ci-md2conf/gI' ./packages/be.vlaanderen.basisregisters.build.pipeline/7.2.6/Content/ci-confluence.sh
-          ./packages/be.vlaanderen.basisregisters.build.pipeline/7.2.6/Content/ci-confluence.sh
+          ./packages/Be.Vlaanderen.Basisregisters.Build.Pipeline/Content/ci-confluence.sh
         env:
           CONFLUENCE_TITLE: ${{ env.REPOSITORY_NAME }}
           CONFLUENCE_USERNAME: ${{ secrets.VBR_CONFLUENCE_USER }}
@@ -564,7 +559,7 @@ jobs:
       - name: Create Jira Release
         if: needs.set-release-version.outputs.version != 'none'
         shell: bash
-        run: ./packages/be.vlaanderen.basisregisters.build.pipeline/7.2.6/Content/ci-jira.sh
+        run: ./packages/Be.Vlaanderen.Basisregisters.Build.Pipeline/Content/ci-jira.sh
         env:
           CONFLUENCE_TITLE: ${{ env.REPOSITORY_NAME }}
           CONFLUENCE_USERNAME: ${{ secrets.VBR_CONFLUENCE_USER }}

diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,8 @@
 
 appsettings.*.json
 
+.paket/
+
 *.rsuser
 *.suo
 *.user

diff --git a/AssociationRegistry.KboMutations.sln b/AssociationRegistry.KboMutations.sln
@@ -14,7 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		invoke.local.sh = invoke.local.sh
 		README.md = README.md
 		package.json = package.json
-		NuGet.Config = NuGet.Config
+		paket.dependencies = paket.dependencies
+		paket.lock = paket.lock
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{26FCD4EA-8B49-4F8E-8E68-C63576940F0C}"

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -18,7 +18,6 @@
     <PackageVersion Include="AWSSDK.S3" Version="3.7.308.8" />
     <PackageVersion Include="Be.Vlaanderen.Basisregisters.AssociationRegistry" Version="8.99.0" />
     <PackageVersion Include="Be.Vlaanderen.Basisregisters.AssociationRegistry.Magda" Version="8.98.26" />
-    <PackageVersion Include="Be.Vlaanderen.Basisregisters.Build.Pipeline" Version="7.2.6" />
     <PackageVersion Include="CsvHelper" Version="32.0.3" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="Marten" Version="7.18.0" />

diff --git a/NuGet.Config b/NuGet.Config
diff --git a/paket.dependencies b/paket.dependencies
@@ -0,0 +1,6 @@
+framework: auto-detect
+source https://api.nuget.org/v3/index.json
+
+nuget Be.Vlaanderen.Basisregisters.Build.Pipeline
+
+
diff --git a/paket.lock b/paket.lock
@@ -0,0 +1,8 @@
+NUGET
+  remote: https://api.nuget.org/v3/index.json
+    Be.Vlaanderen.Basisregisters.Build.Pipeline (7.2.6)
+
+###################################################################################################################################
+################ We only use this file for the build pipeline, since nuget forces a different capitalization ######################
+###################################### DONT ADD PAKET.REFERENCES FILES IN THE PROJECTS ############################################
+###################################################################################################################################
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,8 @@ @@
     appsettings.*.json
+    .paket/
     *.rsuser
     *.suo
     *.user
@@ Expand Down @@