Skip to content
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

Configure repo for Central Package Management #12175

Merged
merged 22 commits into from
Oct 2, 2024
Merged

Configure repo for Central Package Management #12175

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f43cfb7
Enable Central Package Management (CPM)
richlander Sep 18, 2024
a19c100
Move versions to D.P.p
richlander Sep 18, 2024
8d4b0a1
Add import
richlander Sep 18, 2024
d3c3960
Add package source mapping
richlander Sep 19, 2024
a53f33d
Alpha-order PackageVersion elements
richlander Sep 19, 2024
a711bc4
Remove old feeds
richlander Sep 19, 2024
87488b4
Add LF to EOF
richlander Sep 19, 2024
55c5a2a
Fix typos
richlander Sep 19, 2024
6fa2c05
Switch back to properties for versions
richlander Sep 19, 2024
3b5a9d1
Update package source mapping
richlander Sep 20, 2024
8453fd7
Add GPF folder
richlander Sep 24, 2024
fefb949
Add xunit.assert back
richlander Sep 24, 2024
8029ebb
Remove local directory
richlander Sep 24, 2024
8a809e7
Add more mappings
richlander Sep 24, 2024
adb70ad
Add PrivateAssets attribute, per suggestion
richlander Sep 25, 2024
be74b75
Do not add a <PackageVersion /> for xunit.assert for test projects
jeffkl Sep 26, 2024
025ea2c
Merge pull request #1 from jeffkl/cpm
richlander Sep 26, 2024
1d26134
Add references from CodeCoverage.proj
richlander Sep 26, 2024
8cae9a9
Categorize packages
richlander Oct 1, 2024
3ae1ec6
Update MicrosoftCodeAnalysisNetAnalyzersVersion to stable version
richlander Oct 1, 2024
b03c264
Pin dependencies
richlander Oct 1, 2024
e8b23c4
Remove comments
richlander Oct 1, 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
2 changes: 1 addition & 1 deletion Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<!-- to prevent using MS.NC.Platforms from SDK, which is lagging behind the version that WinForms gets from the CoreFx packages -->
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsPackageVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.NETCore.Platforms" PrivateAssets="all" />
</ItemGroup>

<!-- Set code coverage properties that reference properties not available in Directory.Build.props -->
Expand Down
67 changes: 67 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<Project>

<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
<PackageVersion Include="Codecov" Version="$(CodecovVersion)" />
<PackageVersion Include="CSharpIsNullAnalyzer" Version="$(CSharpIsNullAnalyzersVersion)" />
<PackageVersion Include="DotNetAnalyzers.DocumentationAnalyzers" Version="$(DotNetAnalyzersDocumentationAnalyzersVersion)" />
<PackageVersion Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisCommonPackageVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpWorkspacesVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Analyzer.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeRefactoring.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.SourceGenerators.Testing.XUnit" Version="$(MicrosoftCodeAnalysisPackagesVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftCodeAnalysisVisualBasicWorkspacesVersion)" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
<PackageVersion Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesPackageVersion)" />
<PackageVersion Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
<PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
<PackageVersion Include="Microsoft.ManifestTool.CrossPlatform" Version="$(MicrosoftManifestToolCrossPlatformVersion)" />
<PackageVersion Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsPackageVersion)" />
<PackageVersion Include="Microsoft.TargetingPack.NETFramework.v4.7.2" Version="$(MicrosoftTargetingPackNETFrameworkv472PackageVersion)" />
<PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(MicrosoftVisualStudioEngMicroBuildCoreVersion)" />
<PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild" Version="$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="$(MicrosoftWindowsCsWin32PackageVersion)" PrivateAssets="all" />
<PackageVersion Include="Microsoft.WindowsDesktop.App.Ref" Version="$(MicrosoftWindowsDesktopAppRefv30PackageVersion)" />
<PackageVersion Include="Moq" Version="$(MoqPackageVersion)" />
<PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageVersion Include="NuGet.Packaging" Version="$(NugetPackagingVersion)" />
<PackageVersion Include="ReportGenerator" Version="$(ReportGeneratorVersion)" />
<PackageVersion Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersVersion)" />
<PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
<PackageVersion Include="System.Collections.Concurrent" Version="4.3.0" />
<PackageVersion Include="System.ComponentModel.TypeConverter.TestData" Version="$(SystemComponentModelTypeConverterTestDataVersion)" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
<PackageVersion Include="System.Data.SqlClient" Version="5.0.0-alpha.1.19618.1" />
<PackageVersion Include="System.Drawing.Common.TestData" Version="$(SystemDrawingCommonTestDataVersion)" />
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1PackageVersion)" />
lonitra marked this conversation as resolved.
Show resolved Hide resolved
<PackageVersion Include="System.Formats.Nrbf" Version="$(SystemFormatsNrbfPackageVersion)" />
<PackageVersion Include="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />
<PackageVersion Include="System.Management" Version="4.5.0-preview1-25914-04" />
<PackageVersion Include="System.Resources.Extensions" Version="$(SystemResourcesExtensionsPackageVersion)" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
<PackageVersion Include="System.Runtime.Serialization.Formatters" Version="$(SystemRuntimeSerializationFormattersPackageVersion)" />
<PackageVersion Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" />
<PackageVersion Include="System.Windows.Extensions.TestData" Version="$(SystemWindowsExtensionsTestDataVersion)" />
<PackageVersion Include="System.Windows.Forms.DataVisualization" Version="1.0.0-prerelease.20110.1" />
<PackageVersion Include="Verify.Xunit" Version="$(VerifyXunitVersion)" />
<PackageVersion Include="xunit.assert" Version="$(XUnitAssertVersion)" Condition="'$(IsTestProject)' != 'true'" />
<PackageVersion Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
lonitra marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>
</Project>
78 changes: 72 additions & 6 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
<clear />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
richlander marked this conversation as resolved.
Show resolved Hide resolved
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
Expand All @@ -18,11 +15,80 @@
<!-- CsWin32 dailies -->
<add key="winsdk" value="https://pkgs.dev.azure.com/azure-public/winsdk/_packaging/CI/nuget/v3/index.json" />
</packageSources>
<auditSources>
<packageSourceMapping>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</auditSources>
<packageSource key="dotnet-eng">
<package pattern="microsoft.*" />
<package pattern="runtime.*" />
<package pattern="system.*" />
</packageSource>
<packageSource key="dotnet-tools">
lonitra marked this conversation as resolved.
Show resolved Hide resolved
<package pattern="microsoft.*" />
<package pattern="MicroBuild.Core.Sentinel" />
<package pattern="sn" />
</packageSource>
<packageSource key="dotnet8">
<package pattern="microsoft.*" />
</packageSource>
<packageSource key="dotnet8-transport">
<package pattern="system.*" />
</packageSource>
<packageSource key="dotnet9-transport">
<package pattern="microsoft.*" />
</packageSource>
<packageSource key="dotnet10">
<package pattern="microsoft.*" />
<package pattern="runtime.*" />
<package pattern="system.*" />
</packageSource>
<packageSource key="dotnet10-transport">
<package pattern="microsoft.*" />
</packageSource>
<packageSource key="dotnet-public">
<package pattern="Argon" />
lonitra marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where did this list come from? E.g., Argon isn't used in this repo (at least explicitly).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is coming from

winforms/src/System.Windows.Forms.Analyzers.CSharp/tests/UnitTests/System.Windows.Forms.Analyzers.CSharp.Tests.csproj

Line 18 in c9a58e9

<PackageReference Include="Verify.Xunit" Version="$(VerifyXunitVersion)" />

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The list is generated per https://learn.microsoft.com/nuget/consume-packages/package-source-mapping#automated-onboarding-using-tool

<package pattern="Castle.Core" />
<package pattern="Codecov" />
<package pattern="coverlet.msbuild" />
<package pattern="CSharpIsNullAnalyzer" />
<package pattern="DiffEngine" />
<package pattern="DiffPlex" />
<package pattern="DotNetAnalyzers.DocumentationAnalyzers" />
<package pattern="DotNetAnalyzers.DocumentationAnalyzers.Unstable" />
<package pattern="EmptyFiles" />
<package pattern="FluentAssertions" />
<package pattern="Humanizer.Core" />
<package pattern="microsoft.*" />
<package pattern="MicroBuild.Core" />
<package pattern="Moq" />
<package pattern="NETStandard.Library" />
<package pattern="Newtonsoft.Json" />
<package pattern="NuGet.Common" />
<package pattern="NuGet.Configuration" />
<package pattern="NuGet.Frameworks" />
<package pattern="NuGet.Packaging" />
<package pattern="NuGet.Protocol" />
<package pattern="NuGet.Resolver" />
<package pattern="NuGet.Versioning" />
<package pattern="ReportGenerator" />
<package pattern="runtime.*" />
<package pattern="SimpleInfoName" />
<package pattern="StyleCop.Analyzers" />
<package pattern="StyleCop.Analyzers.Unstable" />
<package pattern="system.*" />
<package pattern="Verify" />
<package pattern="Verify.Xunit" />
<package pattern="vswhere" />
<package pattern="xunit.*" />
</packageSource>
<packageSource key="winsdk">
<package pattern="microsoft.*" />
</packageSource>
</packageSourceMapping>
<disabledPackageSources>
<clear />
</disabledPackageSources>
<auditSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</auditSources>
</configuration>
2 changes: 1 addition & 1 deletion eng/ApiCompatibility/PublicApiAnalyzer.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<ItemGroup Condition="'$(UsePublicApiAnalyzers)' == 'true'">
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(MicrosoftCodeAnalysisPublicApiAnalyzersVersion)">
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions eng/CodeCoverage.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Codecov" Version="$(CodecovVersion)" GeneratePathProperty="true" />
<PackageReference Include="ReportGenerator" Version="$(ReportGeneratorVersion)" GeneratePathProperty="true" />
<PackageReference Include="Codecov" GeneratePathProperty="true" />
<PackageReference Include="ReportGenerator" GeneratePathProperty="true" />
</ItemGroup>

<Target Name="GatherCoverageInputs">
Expand Down
8 changes: 4 additions & 4 deletions eng/CodeStyle.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersVersion)" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" />
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" Visible="false" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="$(DotNetAnalyzersDocumentationAnalyzersVersion)" PrivateAssets="all" />
<PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="CSharpIsNullAnalyzer" Version="$(CSharpIsNullAnalyzersVersion)" PrivateAssets="all" />
<PackageReference Include="CSharpIsNullAnalyzer" PrivateAssets="all" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions eng/FacadeAssemblies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@

<ItemGroup Condition="'$(IsFacadeAssemblyNetFx)' == 'true'">
<!-- PrivateAssets="All": don't flow package references to callers -->
<PackageReference Include="Microsoft.TargetingPack.NETFramework.v4.7.2" Version="$(MicrosoftTargetingPackNETFrameworkv472PackageVersion)" PrivateAssets="All" GeneratePathProperty="true" ExcludeAssets="All" NoWarn="NU1701" />
<PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesPackageVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.TargetingPack.NETFramework.v4.7.2" PrivateAssets="All" GeneratePathProperty="true" ExcludeAssets="All" NoWarn="NU1701" />
<PackageReference Include="Microsoft.DotNet.GenFacades" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition="'$(IsFacadeAssemblyNetCore3x)' == 'true'">
<!-- PrivateAssets="All": don't flow package references to callers -->
<PackageReference Include="Microsoft.WindowsDesktop.App.Ref" Version="$(MicrosoftWindowsDesktopAppRefv30PackageVersion)" PrivateAssets="All" GeneratePathProperty="true" ExcludeAssets="All" NoWarn="NU1701" />
<PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesPackageVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.WindowsDesktop.App.Ref" PrivateAssets="All" GeneratePathProperty="true" ExcludeAssets="All" NoWarn="NU1701" />
<PackageReference Include="Microsoft.DotNet.GenFacades" PrivateAssets="All" />
</ItemGroup>

<Target Name="ResolveMatchingContract" BeforeTargets="ResolveAssemblyReferences">
Expand Down
8 changes: 4 additions & 4 deletions eng/Test.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
<PackageReference Include="coverlet.msbuild" Version="$(CoverletMSBuildPackageVersion)" />
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
<PackageReference Include="xunit.stafact" />
<PackageReference Include="coverlet.msbuild" />
<PackageReference Include="Moq" />
</ItemGroup>
</Project>
</Project>
10 changes: 5 additions & 5 deletions eng/common/internal/Tools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<ItemGroup>
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->
<PackageReference Remove="@(PackageReference)"/>
<PackageReference Include="Microsoft.ManifestTool.CrossPlatform" Version="$(MicrosoftManifestToolCrossPlatformVersion)" />
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(MicrosoftVisualStudioEngMicroBuildCoreVersion)" />
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild" Version="$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)" />
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
<PackageReference Include="Microsoft.ManifestTool.CrossPlatform" />
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" />
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild" />
<PackageReference Include="Microsoft.DotNet.IBCMerge" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
<PackageReference Include="Drop.App" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
</ItemGroup>
<PropertyGroup>
<RestoreSources></RestoreSources>
Expand Down
12 changes: 6 additions & 6 deletions src/Common/tests/TestUtilities/System.Windows.Forms.Common.TestUtilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
<PackageReference Include="xunit.stafact" Version="$(XUnitStaFactPackageVersion)" />
<PackageReference Include="xunit.assert" Version="$(XUnitAssertVersion)" />
richlander marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorVersion)" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
<PackageReference Include="Moq" />
<PackageReference Include="System.Collections.Concurrent" />
<PackageReference Include="xunit.assert" />
lonitra marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="xunit.stafact" />
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.VisualBasic/tests/UnitTests/Microsoft.VisualBasic.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/System.Drawing.Common/src/System.Drawing.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
<PrivateAssets>all</PrivateAssets>
</ProjectReference>

<PackageReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />
<PackageReference Include="Microsoft.Windows.CsWin32" Version="$(MicrosoftWindowsCsWin32PackageVersion)">
<PackageReference Include="Microsoft.Win32.SystemEvents" />
<PackageReference Include="Microsoft.Windows.CsWin32">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading