Skip to content

Commit fe1ec5e

Browse files
committed
Use public CFS feed and remove NuGet lockfiles
Partially reverts commit 5b37344.
1 parent c27a92b commit fe1ec5e

File tree

12 files changed

+9
-6345
lines changed

12 files changed

+9
-6345
lines changed

.github/dependabot.yml

-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
version: 2
2-
registries:
3-
nuget-azure:
4-
type: nuget-feed
5-
url: https://pkgs.dev.azure.com/mscodehub/PowerShellCore/_packaging/PowerShellCore_PublicPackages/nuget/v3/index.json
6-
username: powershell
7-
password: ${{ secrets.AZURE_NUGET_TOKEN }}
82
updates:
93
- package-ecosystem: nuget
104
directory: "/"
11-
registries:
12-
- nuget-azure
135
labels: [ ]
146
schedule:
157
interval: weekly

.github/workflows/ci-test.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@ jobs:
3232
uses: actions/setup-dotnet@v4
3333
with:
3434
cache: true
35-
cache-dependency-path: '**/packages.lock.json'
35+
cache-dependency-path: '**/*.csproj'
3636
dotnet-version: |
3737
6.0.x
3838
7.0.x
3939
8.0.x
40+
source-url: https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v3/index.json
4041

41-
- name: Remove Azure Artifact Feed configurations
42-
shell: pwsh
43-
run: Remove-Item ./NuGet.Config
4442

4543
- name: Install PSResources
4644
shell: pwsh

.github/workflows/codeql-analysis.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@ jobs:
3434
uses: actions/setup-dotnet@v4
3535
with:
3636
cache: true
37-
cache-dependency-path: '**/packages.lock.json'
37+
cache-dependency-path: '**/*.csproj'
38+
source-url: https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v3/index.json
3839

39-
- name: Remove Azure Artifact Feed configurations
40-
shell: pwsh
41-
run: Remove-Item ./NuGet.Config
4240

4341
- name: Initialize CodeQL
4442
uses: github/codeql-action/init@v3

.github/workflows/emacs-test.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ jobs:
2626
uses: actions/setup-dotnet@v4
2727
with:
2828
cache: true
29-
cache-dependency-path: '**/packages.lock.json'
29+
cache-dependency-path: '**/*.csproj'
30+
source-url: https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v3/index.json
3031

31-
- name: Remove Azure Artifact Feed configurations
32-
shell: pwsh
33-
run: Remove-Item ./NuGet.Config
3432

3533
- name: Install PSResources
3634
shell: pwsh

.github/workflows/vim-test.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ jobs:
2626
uses: actions/setup-dotnet@v4
2727
with:
2828
cache: true
29-
cache-dependency-path: '**/packages.lock.json'
29+
cache-dependency-path: '**/*.csproj'
30+
source-url: https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v3/index.json
3031

31-
- name: Remove Azure Artifact Feed configurations
32-
shell: pwsh
33-
run: Remove-Item ./NuGet.Config
3432

3533
- name: Install PSResources
3634
shell: pwsh

PowerShellEditorServices.Common.props

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
<RepositoryType>git</RepositoryType>
1212
<RepositoryUrl>https://github.com/PowerShell/PowerShellEditorServices</RepositoryUrl>
1313
<DebugType>portable</DebugType>
14-
<!-- See https://learn.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#locking-dependencies -->
15-
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
1614
<!-- See: https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/overview -->
1715
<EnableNETAnalyzers>true</EnableNETAnalyzers>
1816
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>

NuGet.Config nuget.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<add key="PowerShellCore_PublicPackages" value="https://pkgs.dev.azure.com/mscodehub/PowerShellCore/_packaging/PowerShellCore_PublicPackages/nuget/v3/index.json" />
5+
<add key="PowerShellCore_PublicPackages" value="https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/nuget/v3/index.json" />
66
</packageSources>
77
</configuration>

0 commit comments

Comments
 (0)