Skip to content

Commit 2a80188

Browse files
advay26loic-sharma
andauthored
Adopt PackageSourceMapping for NuGetGallery (#8754)
* Updated the nuget.config files with the namespaces element * Clear global namespace configurations Co-authored-by: Loïc Sharma <[email protected]> * Cleared inherited namespaces in tests/nuget.config and defined new namespaces specific to the tests solution * Removed Strathweb.CacheOutput.WebApi2.StrongName from nuget.org source's namespaces * Simplified tests/NuGet.config: placed all namespaces and common config settings in the root config file * Used Erick's migration tool, changed xml elements, other edits * Updated ServerCommon commit hash in build script so it pulls latest ServerCommon code; introduced an error that should get picked up by sourcemapping in CI/CD * Removed error in sourceMapping, should pass checks in CI/CD now Co-authored-by: Loïc Sharma <[email protected]>
1 parent bbe3f51 commit 2a80188

3 files changed

Lines changed: 56 additions & 16 deletions

File tree

NuGet.config

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,62 @@
1212
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
1313
<add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
1414
</packageSources>
15+
<packageSourceMapping>
16+
<clear />
17+
<packageSource key="nuget">
18+
<package pattern="Antlr" />
19+
<package pattern="Autofac" />
20+
<package pattern="Autofac.*" />
21+
<package pattern="Castle.Core" />
22+
<package pattern="CommonMark.NET" />
23+
<package pattern="CsvHelper" />
24+
<package pattern="d3" />
25+
<package pattern="Dapper.StrongName" />
26+
<package pattern="EntityFramework" />
27+
<package pattern="FluentLinkChecker" />
28+
<package pattern="Hyak.Common" />
29+
<package pattern="Knapcode.MiniZip" />
30+
<package pattern="Lucene.Net" />
31+
<package pattern="Lucene.Net.Contrib" />
32+
<package pattern="Markdig.Signed" />
33+
<package pattern="MicroBuild.Core" />
34+
<package pattern="Microsoft.*" />
35+
<package pattern="Modernizr" />
36+
<package pattern="Moment.js" />
37+
<package pattern="Moq" />
38+
<package pattern="MvcTreeView" />
39+
<package pattern="NETStandard.Library" />
40+
<package pattern="Newtonsoft.Json" />
41+
<package pattern="NuGet.*" />
42+
<package pattern="Owin" />
43+
<package pattern="Polly" />
44+
<package pattern="Polly.Extensions.Http" />
45+
<package pattern="RazorEngine" />
46+
<package pattern="RouteMagic" />
47+
<package pattern="Runtime.*" />
48+
<package pattern="Serilog" />
49+
<package pattern="Serilog.*" />
50+
<package pattern="SerilogTraceListener" />
51+
<package pattern="SharpZipLib" />
52+
<package pattern="System.*" />
53+
<package pattern="WebActivatorEx" />
54+
<package pattern="WebGrease" />
55+
<package pattern="WindowsAzure.*" />
56+
<package pattern="xunit" />
57+
<package pattern="xunit.*" />
58+
</packageSource>
59+
<packageSource key="nuget-build">
60+
<package pattern="Microsoft.AspNet.WebApi.MessageHandlers.Compression.Strongname" />
61+
<package pattern="NuGet.Jobs.*" />
62+
<package pattern="NuGet.Services.*" />
63+
<package pattern="NuGet.StrongName.*" />
64+
<package pattern="Strathweb.CacheOutput.WebApi2.StrongName" />
65+
</packageSource>
66+
</packageSourceMapping>
1567
<activePackageSource>
1668
<add key="All" value="(Aggregate source)" />
1769
</activePackageSource>
70+
<disabledPackageSources>
71+
<clear />
72+
</disabledPackageSources>
1873
</configuration>

build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ param (
1010
[string]$PackageSuffix,
1111
[string]$Branch,
1212
[string]$CommitSHA,
13-
[string]$BuildBranchCommit = 'ade39b693d49b266ec5cac5d939edac7dda2fd92',
13+
[string]$BuildBranchCommit = '92d2a66ef95a1772e748872d77f34a6e951ffdc8',
1414
[string]$VerifyMicrosoftPackageVersion = $null
1515
)
1616

tests/NuGet.Config

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,4 @@
33
<config>
44
<add key="repositorypath" value="..\packages" />
55
</config>
6-
<packageRestore>
7-
<add key="enabled" value="True" />
8-
<add key="automatic" value="True" />
9-
</packageRestore>
10-
<packageSources>
11-
<clear />
12-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
13-
<add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
14-
</packageSources>
15-
<activePackageSource>
16-
<add key="All" value="(Aggregate source)" />
17-
</activePackageSource>
18-
<disabledPackageSources>
19-
<clear />
20-
</disabledPackageSources>
216
</configuration>

0 commit comments

Comments
 (0)