Skip to content

Commit 57eaf06

Browse files
joperezrjoperezr
authored
Moving to Central package management and enabling NuGet auditing (#558)
* Moving to Central package management and enabling NuGet auditing * Readding metadata that shouldn't have been removed * Fix downgrade issues * Fix nuget warning for Microsoft.NETFramework.ReferenceAssemblies * Fixing Linux build
1 parent 200ce31 commit 57eaf06

File tree

18 files changed

+123
-47
lines changed

18 files changed

+123
-47
lines changed

‎NuGet.config

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,29 @@
99
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
1010
<add key="myget-legacy" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
1111
</packageSources>
12+
<auditSources>
13+
<clear />
14+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
15+
</auditSources>
16+
<packageSourceMapping>
17+
<packageSource key="dotnet6">
18+
<package pattern="*" />
19+
</packageSource>
20+
<packageSource key="dotnet8">
21+
<package pattern="*" />
22+
</packageSource>
23+
<packageSource key="dotnet-eng">
24+
<package pattern="*" />
25+
</packageSource>
26+
<packageSource key="dotnet-tools">
27+
<package pattern="*" />
28+
</packageSource>
29+
<packageSource key="dotnet-public">
30+
<package pattern="*" />
31+
</packageSource>
32+
<packageSource key="myget-legacy">
33+
<package pattern="*" />
34+
</packageSource>
35+
</packageSourceMapping>
1236
<disabledPackageSources />
1337
</configuration>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-rc.2.24474.11"
3+
"version": "9.0.100"
44
},
55
"tools": {
6-
"dotnet": "9.0.100-rc.2.24474.11",
6+
"dotnet": "9.0.100",
77
"runtimes": {
88
"dotnet": [
99
"6.0.4",

‎samples/WindowsAuth/WindowsAuth.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="8.0.7" />
11+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
1112
</ItemGroup>
1213

1314
<ItemGroup>

‎src/Directory.Packages.props

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="8.0.0" />
10+
<PackageVersion Include="Microsoft.DotNet.BuildTools.GenAPI" Version="3.0.0-preview4-06015-01" />
11+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
12+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
13+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
14+
<PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
15+
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="6.0.0" />
16+
<PackageVersion Include="System.Runtime.Caching" Version="8.0.0" />
17+
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
18+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
19+
</ItemGroup>
20+
21+
</Project>

‎src/Microsoft.AspNetCore.SystemWebAdapters.Abstractions/Microsoft.AspNetCore.SystemWebAdapters.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<!-- Provided in box for .NET 8+ -->
2121
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
22-
<PackageReference Include="Microsoft.Bcl.TimeProvider" Version="8.0.0" />
22+
<PackageReference Include="Microsoft.Bcl.TimeProvider" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
2424
</ItemGroup>
2525
<ItemGroup>
26-
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="6.0.0" />
27-
<PackageReference Include="System.Text.Json" Version="6.0.0" />
28-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
30-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
26+
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" />
27+
<PackageReference Include="System.Text.Json" />
28+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
29+
<PackageReference Include="Microsoft.Extensions.Options" />
30+
<PackageReference Include="Microsoft.Extensions.Logging" />
3131
</ItemGroup>
3232
<ItemGroup>
3333
<ProjectReference Include="..\Microsoft.AspNetCore.SystemWebAdapters\Microsoft.AspNetCore.SystemWebAdapters.csproj" />

‎src/Microsoft.AspNetCore.SystemWebAdapters/Generated/GenerateApis.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup Condition="$(__Generate)">
19-
<PackageReference Include="Microsoft.DotNet.BuildTools.GenAPI" Version="3.0.0-preview4-06015-01" />
19+
<PackageReference Include="Microsoft.DotNet.BuildTools.GenAPI" />
2020
</ItemGroup>
2121

2222
</Project>

‎src/Microsoft.AspNetCore.SystemWebAdapters/Microsoft.AspNetCore.SystemWebAdapters.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
<Compile Include="IHtmlString.cs" />
3333
<Compile Include="HtmlString.cs" />
3434

35-
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
35+
<PackageReference Include="System.Security.Principal.Windows" />
3636
</ItemGroup>
3737

3838
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
3939

4040
<FrameworkReference Include="Microsoft.AspNetCore.App" />
4141

42-
<PackageReference Include="System.Runtime.Caching" Version="6.0.0" />
42+
<PackageReference Include="System.Runtime.Caching" />
4343

4444
<Using Include="Microsoft.AspNetCore.Http.HttpContext" Alias="HttpContextCore" />
4545
<Using Include="Microsoft.AspNetCore.Http.HttpResponse" Alias="HttpResponseCore" />
@@ -49,7 +49,7 @@
4949
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
5050
<FrameworkReference Include="Microsoft.AspNetCore.App" />
5151

52-
<PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
52+
<PackageReference Include="System.Runtime.Caching" />
5353

5454
<Using Include="Microsoft.AspNetCore.Http.HttpContext" Alias="HttpContextCore" />
5555
<Using Include="Microsoft.AspNetCore.Http.HttpResponse" Alias="HttpResponseCore" />
@@ -64,8 +64,9 @@
6464

6565
<Compile Include="IHtmlString.cs" />
6666
<Compile Include="HtmlString.cs" />
67+
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
6768

68-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
69+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies">
6970
<PrivateAssets>all</PrivateAssets>
7071
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
7172
</PackageReference>

‎test/Directory.Packages.props

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageVersion Include="AutoFixture" Version="4.15.0" />
10+
<PackageVersion Include="Autofac.Extras.Moq" Version="6.0.0" />
11+
<PackageVersion Include="Basic.Reference.Assemblies" Version="1.4.5" />
12+
<PackageVersion Include="coverlet.collector" Version="3.1.2" />
13+
<PackageVersion Include="jQuery" Version="3.7.1" />
14+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="6.0.13" />
15+
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.8.0" />
16+
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3" />
17+
<PackageVersion Include="Microsoft.Playwright.NUnit" Version="1.25.0" />
18+
<PackageVersion Include="Moq" Version="4.16.1" />
19+
<PackageVersion Include="NUnit" Version="3.13.3" />
20+
<PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
21+
<PackageVersion Include="NUnit.Analyzers" Version="3.3.0" />
22+
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
23+
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="6.0.0" />
24+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
25+
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
26+
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
27+
</ItemGroup>
28+
29+
</Project>

‎test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/CopyFrameworkAdapters.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
-->
1010

1111
<ItemGroup>
12-
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="6.0.0" />
12+
<PackageReference Include="System.Reflection.MetadataLoadContext" />
1313
</ItemGroup>
1414

1515
<PropertyGroup>
1616
<FrameworkAdapterDirectory>adapters/netfx/</FrameworkAdapterDirectory>
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" PrivateAssets="All" Version="1.0.0" GeneratePathProperty="true" />
20+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" PrivateAssets="All" GeneratePathProperty="true" />
2121
<Content Include="$(PkgMicrosoft_NETFramework_ReferenceAssemblies_net472)\build\.NETFramework\v4.7.2\**">
2222
<Visible>false</Visible>
2323
<Link>$(FrameworkAdapterDirectory)/%(RecursiveDir)%(Filename)%(Extension)</Link>

‎test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Autofac.Extras.Moq" Version="6.0.0" />
9-
<PackageReference Include="AutoFixture" Version="4.15.0" />
10-
<PackageReference Include="Basic.Reference.Assemblies" Version="1.4.5" />
11-
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" />
12-
<PackageReference Include="Moq" Version="4.16.1" />
8+
<PackageReference Include="Autofac.Extras.Moq" />
9+
<PackageReference Include="AutoFixture" />
10+
<PackageReference Include="Basic.Reference.Assemblies" />
11+
<PackageReference Include="Microsoft.CodeAnalysis" />
12+
<PackageReference Include="Moq" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="Autofac.Extras.Moq" Version="6.0.0" />
7-
<PackageReference Include="AutoFixture" Version="4.15.0" />
8-
<PackageReference Include="Moq" Version="4.16.1" />
9-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.13" />
10-
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
6+
<PackageReference Include="Autofac.Extras.Moq" />
7+
<PackageReference Include="AutoFixture" />
8+
<PackageReference Include="Moq" />
9+
<PackageReference Include="Microsoft.AspNetCore.TestHost" />
10+
<PackageReference Include="System.Collections.Immutable" />
1111
</ItemGroup>
1212
<ItemGroup>
1313
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.SystemWebAdapters.CoreServices\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj" />

‎test/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<Compile Include="..\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests\SessionState\Serialization\JsonSessionKeySerializerTests.cs" Link="SessionState\JsonSessionKeySerializerTests.cs" />
99
</ItemGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Autofac.Extras.Moq" Version="6.0.0" />
12-
<PackageReference Include="AutoFixture" Version="4.15.0" />
13-
<PackageReference Include="Moq" Version="4.16.1" />
11+
<PackageReference Include="Autofac.Extras.Moq" />
12+
<PackageReference Include="AutoFixture" />
13+
<PackageReference Include="Moq" />
1414
</ItemGroup>
1515
<ItemGroup>
1616
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj" />

‎test/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Autofac.Extras.Moq" Version="6.0.0" />
11-
<PackageReference Include="AutoFixture" Version="4.15.0" />
12-
<PackageReference Include="Moq" Version="4.16.1" />
10+
<PackageReference Include="Autofac.Extras.Moq" />
11+
<PackageReference Include="AutoFixture" />
12+
<PackageReference Include="Moq" />
1313
</ItemGroup>
1414

1515
<!-- Used for tests but not directly -->
1616
<ItemGroup>
17-
<PackageReference Include="jQuery" Version="3.7.1" CopyContent="true" />
17+
<PackageReference Include="jQuery" CopyContent="true" />
1818
</ItemGroup>
1919

2020
<Import Project="$(SolutionRootDirectory)src/Microsoft.AspNetCore.SystemWebAdapters/Build/Microsoft.AspNetCore.SystemWebAdapters.targets" />

‎test/Microsoft.AspNetCore.SystemWebAdapters.Tests/Microsoft.AspNetCore.SystemWebAdapters.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Autofac.Extras.Moq" Version="6.0.0" />
9-
<PackageReference Include="AutoFixture" Version="4.15.0" />
10-
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" />
11-
<PackageReference Include="Moq" Version="4.16.1" />
8+
<PackageReference Include="Autofac.Extras.Moq" />
9+
<PackageReference Include="AutoFixture" />
10+
<PackageReference Include="Microsoft.CodeAnalysis" />
11+
<PackageReference Include="Moq" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎test/Samples.MVCApp.Tests/Samples.MVCApp.Tests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Playwright.NUnit" Version="1.25.0" />
13-
<PackageReference Include="NUnit" Version="3.13.3" />
14-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
15-
<PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
16-
<PackageReference Include="coverlet.collector" Version="3.1.2" />
12+
<PackageReference Include="Microsoft.Playwright.NUnit" />
13+
<PackageReference Include="NUnit" />
14+
<PackageReference Include="NUnit3TestAdapter" />
15+
<PackageReference Include="NUnit.Analyzers" />
16+
<PackageReference Include="coverlet.collector" />
1717
</ItemGroup>
1818

1919
</Project>

‎test/Samples.RemoteAuth.Forms.Tests/Samples.RemoteAuth.Forms.Tests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Playwright.NUnit" Version="1.25.0" />
13-
<PackageReference Include="NUnit" Version="3.13.3" />
14-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
15-
<PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
16-
<PackageReference Include="coverlet.collector" Version="3.1.2" />
12+
<PackageReference Include="Microsoft.Playwright.NUnit" />
13+
<PackageReference Include="NUnit" />
14+
<PackageReference Include="NUnit3TestAdapter" />
15+
<PackageReference Include="NUnit.Analyzers" />
16+
<PackageReference Include="coverlet.collector" />
1717
</ItemGroup>
1818

1919
</Project>

0 commit comments

Comments
 (0)