Use public CFS feed and remove NuGet lockfiles (#2161)

Partially reverts commit 5b37344.
PowerShell · Apr 26, 2024 · ea5f3f0 · ea5f3f0
1 parent c27a92b
commit ea5f3f0
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 6,349 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,15 +1,7 @@
 version: 2
-registries:
-  nuget-azure:
-    type: nuget-feed
-    url: https://pkgs.dev.azure.com/mscodehub/PowerShellCore/_packaging/PowerShellCore_PublicPackages/nuget/v3/index.json
-    username: powershell
-    password: ${{ secrets.AZURE_NUGET_TOKEN }}
 updates:
 - package-ecosystem: nuget
   directory: "/"
-  registries:
-    - nuget-azure
   labels: [ ]
   schedule:
     interval: weekly

diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
@@ -32,16 +32,12 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           cache: true
-          cache-dependency-path: '**/packages.lock.json'
+          cache-dependency-path: '**/*.csproj'
           dotnet-version: |
             6.0.x
             7.0.x
             8.0.x
 
-      - name: Remove Azure Artifact Feed configurations
-        shell: pwsh
-        run: Remove-Item ./NuGet.Config
-
       - name: Install PSResources
         shell: pwsh
         run: ./tools/installPSResources.ps1

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -34,11 +34,7 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         cache: true
-        cache-dependency-path: '**/packages.lock.json'
-
-    - name: Remove Azure Artifact Feed configurations
-      shell: pwsh
-      run: Remove-Item ./NuGet.Config
+        cache-dependency-path: '**/*.csproj'
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3

diff --git a/.github/workflows/emacs-test.yml b/.github/workflows/emacs-test.yml
@@ -26,11 +26,7 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           cache: true
-          cache-dependency-path: '**/packages.lock.json'
-
-      - name: Remove Azure Artifact Feed configurations
-        shell: pwsh
-        run: Remove-Item ./NuGet.Config
+          cache-dependency-path: '**/*.csproj'
 
       - name: Install PSResources
         shell: pwsh

diff --git a/.github/workflows/vim-test.yml b/.github/workflows/vim-test.yml
@@ -26,11 +26,7 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           cache: true
-          cache-dependency-path: '**/packages.lock.json'
-
-      - name: Remove Azure Artifact Feed configurations
-        shell: pwsh
-        run: Remove-Item ./NuGet.Config
+          cache-dependency-path: '**/*.csproj'
 
       - name: Install PSResources
         shell: pwsh

diff --git a/PowerShellEditorServices.Common.props b/PowerShellEditorServices.Common.props
@@ -11,8 +11,6 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/PowerShell/PowerShellEditorServices</RepositoryUrl>
     <DebugType>portable</DebugType>
-    <!-- See https://learn.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#locking-dependencies -->
-    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <!-- See: https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/overview -->
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>

diff --git a/NuGet.Config → nuget.config b/NuGet.Config → nuget.config
@@ -2,6 +2,6 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="PowerShellCore_PublicPackages" value="https://pkgs.dev.azure.com/mscodehub/PowerShellCore/_packaging/PowerShellCore_PublicPackages/nuget/v3/index.json" />
+    <add key="PowerShellCore_PublicPackages" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v3/index.json" />
   </packageSources>
 </configuration>