Skip to content

Moving to Central package management and enabling NuGet auditing #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 19, 2024
Merged

Moving to Central package management and enabling NuGet auditing #558

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a345f3
Moving to Central package management and enabling NuGet auditing
joperezr Nov 18, 2024
5f753a3
Readding metadata that shouldn't have been removed
joperezr Nov 18, 2024
3896043
Fix downgrade issues
joperezr Nov 18, 2024
6633923
Fix nuget warning for Microsoft.NETFramework.ReferenceAssemblies
joperezr Nov 19, 2024
762674c
Fixing Linux build
joperezr Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,29 @@
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="myget-legacy" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
</packageSources>
<auditSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</auditSources>
<packageSourceMapping>
<packageSource key="dotnet6">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet8">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet-eng">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet-tools">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet-public">
<package pattern="*" />
</packageSource>
<packageSource key="myget-legacy">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
<disabledPackageSources />
</configuration>
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "9.0.100-rc.2.24474.11"
"version": "9.0.100"
},
"tools": {
"dotnet": "9.0.100-rc.2.24474.11",
"dotnet": "9.0.100",
"runtimes": {
"dotnet": [
"6.0.4",
Expand Down
1 change: 1 addition & 0 deletions samples/WindowsAuth/WindowsAuth.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
22 changes: 22 additions & 0 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Project>

<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="8.0.0" />
<PackageVersion Include="Microsoft.DotNet.BuildTools.GenAPI" Version="3.0.0-preview4-06015-01" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="6.0.0" />
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
<PackageVersion Include="System.Runtime.Caching" Version="8.0.0" />
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...SystemWebAdapters.Abstractions/Microsoft.AspNetCore.SystemWebAdapters.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...SystemWebAdapters.CoreServices/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

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

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions ...dapters.FrameworkServices/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
Expand All @@ -23,11 +23,11 @@
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="6.0.0" />
<PackageReference Include="System.Text.Json" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.Extensions.Options" />
<PackageReference Include="Microsoft.Extensions.Logging" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.AspNetCore.SystemWebAdapters\Microsoft.AspNetCore.SystemWebAdapters.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.AspNetCore.SystemWebAdapters/Generated/GenerateApis.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>

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

</Project>
8 changes: 4 additions & 4 deletions src/Microsoft.AspNetCore.SystemWebAdapters/Microsoft.AspNetCore.SystemWebAdapters.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
<Compile Include="IHtmlString.cs" />
<Compile Include="HtmlString.cs" />

<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
<PackageReference Include="System.Security.Principal.Windows" />
</ItemGroup>

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

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

<PackageReference Include="System.Runtime.Caching" Version="6.0.0" />
<PackageReference Include="System.Runtime.Caching" />

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

<PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
<PackageReference Include="System.Runtime.Caching" />

<Using Include="Microsoft.AspNetCore.Http.HttpContext" Alias="HttpContextCore" />
<Using Include="Microsoft.AspNetCore.Http.HttpResponse" Alias="HttpResponseCore" />
Expand All @@ -65,7 +65,7 @@
<Compile Include="IHtmlString.cs" />
<Compile Include="HtmlString.cs" />

<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
29 changes: 29 additions & 0 deletions test/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Project>

<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="AutoFixture" Version="4.15.0" />
<PackageVersion Include="Autofac.Extras.Moq" Version="6.0.0" />
<PackageVersion Include="Basic.Reference.Assemblies" Version="1.4.5" />
<PackageVersion Include="coverlet.collector" Version="3.1.2" />
<PackageVersion Include="jQuery" Version="3.7.1" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="6.0.13" />
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.8.0" />
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3" />
<PackageVersion Include="Microsoft.Playwright.NUnit" Version="1.25.0" />
<PackageVersion Include="Moq" Version="4.16.1" />
<PackageVersion Include="NUnit" Version="3.13.3" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageVersion Include="NUnit.Analyzers" Version="3.3.0" />
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="6.0.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions test/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests/CopyFrameworkAdapters.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
-->

<ItemGroup>
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="6.0.0" />
<PackageReference Include="System.Reflection.MetadataLoadContext" />
</ItemGroup>

<PropertyGroup>
<FrameworkAdapterDirectory>adapters/netfx/</FrameworkAdapterDirectory>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" PrivateAssets="All" Version="1.0.0" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" PrivateAssets="All" GeneratePathProperty="true" />
<Content Include="$(PkgMicrosoft_NETFramework_ReferenceAssemblies_net472)\build\.NETFramework\v4.7.2\**">
<Visible>false</Visible>
<Link>$(FrameworkAdapterDirectory)/%(RecursiveDir)%(Filename)%(Extension)</Link>
Expand Down
10 changes: 5 additions & 5 deletions ...ore.SystemWebAdapters.Apis.Tests/Microsoft.AspNetCore.SystemWebAdapters.Apis.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Autofac.Extras.Moq" Version="6.0.0" />
<PackageReference Include="AutoFixture" Version="4.15.0" />
<PackageReference Include="Basic.Reference.Assemblies" Version="1.4.5" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="Autofac.Extras.Moq" />
<PackageReference Include="AutoFixture" />
<PackageReference Include="Basic.Reference.Assemblies" />
<PackageReference Include="Microsoft.CodeAnalysis" />
<PackageReference Include="Moq" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions ...pters.CoreServices.Tests/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Autofac.Extras.Moq" Version="6.0.0" />
<PackageReference Include="AutoFixture" Version="4.15.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.13" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
<PackageReference Include="Autofac.Extras.Moq" />
<PackageReference Include="AutoFixture" />
<PackageReference Include="Moq" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" />
<PackageReference Include="System.Collections.Immutable" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.SystemWebAdapters.CoreServices\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.csproj" />
Expand Down
6 changes: 3 additions & 3 deletions ...eworkServices.Tests/Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<Compile Include="..\Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests\SessionState\Serialization\JsonSessionKeySerializerTests.cs" Link="SessionState\JsonSessionKeySerializerTests.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autofac.Extras.Moq" Version="6.0.0" />
<PackageReference Include="AutoFixture" Version="4.15.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="Autofac.Extras.Moq" />
<PackageReference Include="AutoFixture" />
<PackageReference Include="Moq" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices\Microsoft.AspNetCore.SystemWebAdapters.FrameworkServices.csproj" />
Expand Down
8 changes: 4 additions & 4 deletions ...e.SystemWebAdapters.NuGet.Tests/Microsoft.AspNetCore.SystemWebAdapters.NuGet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Autofac.Extras.Moq" Version="6.0.0" />
<PackageReference Include="AutoFixture" Version="4.15.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="Autofac.Extras.Moq" />
<PackageReference Include="AutoFixture" />
<PackageReference Include="Moq" />
</ItemGroup>

<!-- Used for tests but not directly -->
<ItemGroup>
<PackageReference Include="jQuery" Version="3.7.1" CopyContent="true" />
<PackageReference Include="jQuery" CopyContent="true" />
</ItemGroup>

<Import Project="$(SolutionRootDirectory)src/Microsoft.AspNetCore.SystemWebAdapters/Build/Microsoft.AspNetCore.SystemWebAdapters.targets" />
Expand Down
8 changes: 4 additions & 4 deletions ...ft.AspNetCore.SystemWebAdapters.Tests/Microsoft.AspNetCore.SystemWebAdapters.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Autofac.Extras.Moq" Version="6.0.0" />
<PackageReference Include="AutoFixture" Version="4.15.0" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="Autofac.Extras.Moq" />
<PackageReference Include="AutoFixture" />
<PackageReference Include="Microsoft.CodeAnalysis" />
<PackageReference Include="Moq" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions test/Samples.MVCApp.Tests/Samples.MVCApp.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Playwright.NUnit" Version="1.25.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
<PackageReference Include="coverlet.collector" Version="3.1.2" />
<PackageReference Include="Microsoft.Playwright.NUnit" />
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="NUnit.Analyzers" />
<PackageReference Include="coverlet.collector" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions test/Samples.RemoteAuth.Forms.Tests/Samples.RemoteAuth.Forms.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Playwright.NUnit" Version="1.25.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
<PackageReference Include="coverlet.collector" Version="3.1.2" />
<PackageReference Include="Microsoft.Playwright.NUnit" />
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="NUnit.Analyzers" />
<PackageReference Include="coverlet.collector" />
</ItemGroup>

</Project>