Skip to content

Commit

Permalink
[ci] Remove use of System.Formats.Asn1 by removing Microsoft.Build.Ta…
Browse files Browse the repository at this point in the history
…sks.Core (dotnet#26163)

* [nuget] Update System.Formats.Asn1

* Try remove Microsoft.Build.Tasks.Core

* Remove usage of possibly not required deps

* Cleanup

---------

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
  • Loading branch information
rmarinho and mattleibow authored Nov 30, 2024
1 parent d483d70 commit 1e33657
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 8 deletions.
1 change: 0 additions & 1 deletion eng/NuGetVersions.targets
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@
Version="$(SystemDrawingCommonPackageVersion)"
/>


<PackageReference Update="Microsoft.DotNet.Build.Tasks.Workloads" Version="$(MicrosoftDotNetBuildTasksWorkloadsPackageVersion)" />
<PackageReference Update="Microsoft.Signed.WiX" Version="$(MicrosoftSignedWixVersion)" />
<PackageReference Update="MicroBuild.Plugins.SwixBuild.Dotnet" Version="$(MicroBuildPluginsSwixBuildDotnetPackageVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<FizzlerPackageVersion>1.3.0</FizzlerPackageVersion>
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
<ExCSSPackageVersion>4.2.3</ExCSSPackageVersion>
<SystemDrawingCommonPackageVersion>8.0.3</SystemDrawingCommonPackageVersion>
<SystemDrawingCommonPackageVersion>9.0.0</SystemDrawingCommonPackageVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24572.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24572.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24572.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
Expand Down
2 changes: 0 additions & 2 deletions src/Controls/src/Build.Tasks/Controls.Build.Tasks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@
<ItemGroup>
<PackageReference Include="Mono.Cecil" Version="0.11.5" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="System.CodeDom" Version="7.0.0" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.Build" Version="17.8.3" PrivateAssets="all" Condition=" '$(_IncludeMicrosoftBuildPackage)' == 'true' "/>
<PackageReference Include="Microsoft.Build.Framework" Version="17.8.3" PrivateAssets="all" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.8.3" PrivateAssets="all" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.8.3" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.5" />
<PackageReference Include="System.CodeDom" Version="7.0.0" />
<PackageReference Include="Microsoft.Build" Version="16.9.0" />
<PackageReference Include="Microsoft.Build.Framework" Version="16.9.0" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.9.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
</ItemGroup>

Expand Down
2 changes: 0 additions & 2 deletions src/SingleProject/Resizetizer/src/Resizetizer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="17.8.3" PrivateAssets="all" Condition=" '$(_IncludeMicrosoftBuildPackage)' == 'true' " />
<PackageReference Include="Microsoft.Build.Framework" Version="17.8.3" PrivateAssets="all" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.8.3" PrivateAssets="all" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.8.3" PrivateAssets="all" />
</ItemGroup>

<Import Project="ResizetizerPackages.projitems" />
Expand Down

0 comments on commit 1e33657

Please sign in to comment.