Skip to content

Commit 7087371

Browse files
Phil-NHSPhil-NHS
committed
refactor(nuget): nuget position to solution level
1 parent 87f3f5c commit 7087371

File tree

8 files changed

+104
-88
lines changed

8 files changed

+104
-88
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,4 @@ obj
6262
/LearningHub.Nhs.WebUI.BlazorClient/wwwroot/appsettings.Development.json
6363
/LearningHub.Nhs.WebUI.BlazorClient/nuget.config
6464
/LearningHub.Nhs.WebUI.BlazorClient/LearningHub.Nhs.WebUI.BlazorClient.csproj.user
65+
/nuget.config

‎LearningHub.Nhs.WebUI.BlazorClient/LearningHub.Nhs.WebUI.BlazorClient.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
<Folder Include="Properties\" />
3737
</ItemGroup>
3838

39-
<ItemGroup>
40-
<Content Include="nuget.config.template" />
41-
</ItemGroup>
42-
4339
<ItemGroup>
4440
<ProjectReference Include="..\LearningHub.Nhs.Shared\LearningHub.Nhs.Shared.csproj" />
4541
<ProjectReference Include="..\LearningHub.Nhs.WebUI.Shared\LearningHub.Nhs.WebUI.Shared.csproj" />

‎LearningHub.Nhs.WebUI.BlazorClient/nuget.config.template‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎LearningHub.Nhs.WebUI.sln‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1212
ProjectSection(SolutionItems) = preProject
1313
.editorconfig = .editorconfig
1414
global.json = global.json
15+
nuget.config = nuget.config
16+
nuget.config.cicd = nuget.config.cicd
17+
nuget.config.template = nuget.config.template
1518
StyleCop.ruleset = StyleCop.ruleset
1619
EndProjectSection
1720
EndProject

‎LearningHub.Nhs.WebUI/nuget.config.cicd‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎LearningHub.Nhs.WebUI/nuget.config.template‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎nuget.config.cicd‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<!-- using environmental variables:
4+
* for cicd sed replace environmental variables
5+
-->
6+
<packageSources>
7+
<!--Clean and just use these sources-->
8+
<clear />
9+
<!--<add key="TELLocalNugetFeed" value="%TEL_LOCAL_FEED%" />-->
10+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
11+
<add key="TELGitNugetFeed" value="%TEL_GITHUB_FEED%" />
12+
<add key="TELAzureNugetFeed" value="%TEL_AZURE_FEED%" />
13+
</packageSources>
14+
15+
<packageSourceCredentials>
16+
<TELGitNugetFeed>
17+
<add key="Username" value="%TEL_GITHUB_USERNAME%" />
18+
<!--cleartext for benefit of github actions-->
19+
<add key="ClearTextPassword" value="%TEL_GITHUB_TOKEN%" />
20+
</TELGitNugetFeed>
21+
22+
<TELAzureNugetFeed>
23+
<!--Instead of windows user account credentials https://dev.azure.com/e-LfH/_usersSettings/tokens-->
24+
<add key="Username" value="%TEL_AZURE_USERNAME%" />
25+
<!--cleartext for benefit of github actions-->
26+
<add key="ClearTextPassword" value="%TEL_AZURE_PAT%" />
27+
</TELAzureNugetFeed>
28+
</packageSourceCredentials>
29+
30+
<!--Use local package first if not found use remote-->
31+
<!--<packageSource key="TELLocalNugetFeed">
32+
<package pattern="*" />
33+
</packageSource>-->
34+
35+
<packageSourceMapping>
36+
<packageSource key="TELGitNugetFeed">
37+
<package pattern="TELBlazor.*" />
38+
<package pattern="*" />
39+
</packageSource>
40+
41+
<packageSource key="TELAzureNugetFeed">
42+
<package pattern="LearningHub.*" />
43+
</packageSource>
44+
45+
<!--Check official nuget last-->
46+
<packageSource key="nuget.org">
47+
<package pattern="*" />
48+
</packageSource>
49+
</packageSourceMapping>
50+
</configuration>

‎nuget.config.template‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<!-- using environmental variables:
4+
* for cicd sed replace environmental variables
5+
-->
6+
<packageSources>
7+
<!--Clean and just use these sources-->
8+
<clear />
9+
<!--<add key="TELLocalNugetFeed" value="%TEL_LOCAL_FEED%" />-->
10+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
11+
<add key="TELGitNugetFeed" value="%TEL_GITHUB_FEED%" />
12+
<add key="TELAzureNugetFeed" value="%TEL_AZURE_FEED%" />
13+
</packageSources>
14+
15+
<packageSourceCredentials>
16+
<TELGitNugetFeed>
17+
<add key="Username" value="%TEL_GITHUB_USERNAME%" />
18+
<!--cleartext for benefit of github actions-->
19+
<add key="ClearTextPassword" value="%TEL_GITHUB_TOKEN%" />
20+
</TELGitNugetFeed>
21+
22+
<TELAzureNugetFeed>
23+
<!--Instead of windows user account credentials https://dev.azure.com/e-LfH/_usersSettings/tokens-->
24+
<add key="Username" value="%TEL_AZURE_USERNAME%" />
25+
<!--cleartext for benefit of github actions-->
26+
<add key="ClearTextPassword" value="%TEL_AZURE_PAT%" />
27+
</TELAzureNugetFeed>
28+
</packageSourceCredentials>
29+
30+
<!--Use local package first if not found use remote-->
31+
<!--<packageSource key="TELLocalNugetFeed">
32+
<package pattern="*" />
33+
</packageSource>-->
34+
35+
<packageSourceMapping>
36+
<packageSource key="TELGitNugetFeed">
37+
<package pattern="TELBlazor.*" />
38+
<package pattern="*" />
39+
</packageSource>
40+
41+
<packageSource key="TELAzureNugetFeed">
42+
<package pattern="LearningHub.*" />
43+
</packageSource>
44+
45+
<!--Check official nuget last-->
46+
<packageSource key="nuget.org">
47+
<package pattern="*" />
48+
</packageSource>
49+
</packageSourceMapping>
50+
</configuration>

0 commit comments

Comments
 (0)