Skip to content

[main] Bump a few package versions #14003

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
dougbu merged 2 commits into from
Nov 2, 2023
Merged

[main] Bump a few package versions #14003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a53ae3
[main] Bump a few package versions
dougbu Aug 25, 2023
74febe6
Remove project file changes
dougbu Nov 2, 2023
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
1 change: 1 addition & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
<PackageVersion Include="System.Composition" Version="$(SystemCompositionVersion)" />
<PackageVersion Include="System.IO.Packaging" Version="$(SystemIOPackagingVersion)" />
<PackageVersion Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
<PackageVersion Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlVersion)" />
Copy link
Member

@ViktorHofer ViktorHofer Nov 6, 2023

Choose a reason for hiding this comment

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

Can you please explain why this transitive dependency bump was necessary? What was the old version that came in and in which projects?

Copy link
Contributor Author

@dougbu dougbu Nov 6, 2023

Choose a reason for hiding this comment

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

v6.0.0 came in before, in every project that referenced Microsoft.Build.Tasks.Core

Copy link
Member

@ViktorHofer ViktorHofer Nov 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

I see. Did you consider updating the Microsoft.Build packages instead? I see that newer packages don't bring the non-desirable one in anymore. VS 17.8 (which is required by main anyway) already supports .NET 8.

Copy link
Contributor Author

@dougbu dougbu Nov 6, 2023

Choose a reason for hiding this comment

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

I considered it but hit some source-build issues. we could change the approach but I'm not sure that's worthwhile

<PackageVersion Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
<!-- sdk -->
Expand Down
5 changes: 3 additions & 2 deletions eng/BuildTask.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
<PackageReference Update="System.Reflection.Metadata" Publish="false" />
<PackageReference Update="System.Reflection.MetadataLoadContext" Publish="false" />
<PackageReference Update="System.Runtime.CompilerServices.Unsafe" Publish="false" />
<PackageReference Update="System.Security.Cryptography.Xml" Publish="false" />
<PackageReference Update="System.Text.Encodings.Web" Publish="false" />
<PackageReference Update="System.Text.Json" Publish="false" />
<PackageReference Update="System.Threading.Tasks.Dataflow" Publish="false" />
Expand All @@ -82,11 +83,11 @@
<Reference Update="@(Reference)"
Pack="false" />
</ItemGroup>

<!-- Publish .NET Core assets and include them in the package under $(BuildTaskTargetFolder) directory. -->
<Target Name="_AddBuildOutputToPackageCore" DependsOnTargets="Publish" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<ItemGroup>
<TfmSpecificPackageFile Include="$(PublishDir)**"
<TfmSpecificPackageFile Include="$(PublishDir)**"
PackagePath="$(BuildTaskTargetFolder)/$(TargetFramework)/%(RecursiveDir)%(FileName)%(Extension)"/>
</ItemGroup>
</Target>
Expand Down
2 changes: 2 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@
<SystemIOPackagingVersion>8.0.0-preview.4.23259.5</SystemIOPackagingVersion>
<!-- Keep this version in sync with what msbuild / VS ships with. -->
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
<!-- Do not move too far ahead of what Microsoft.Build.Tasks.Core depends on (currently >=6.0.0). -->
<SystemSecurityCryptographyXmlVersion>6.0.1</SystemSecurityCryptographyXmlVersion>
<SystemTextEncodingsWebVersion>8.0.0-preview.4.23259.5</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>8.0.0-preview.4.23259.5</SystemTextJsonVersion>
<!-- sdk -->
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageReference Include="Microsoft.Build.Tasks.Core" />
<PackageReference Include="Moq" />
</ItemGroup>

<ItemGroup>
<Content Include="testassets\**\*" CopyToOutputDirectory="PreserveNewest" />
<Content Include="$(RepositoryEngineeringDir)common\**\*" LinkBase="testassets\boilerplate\eng\common\" CopyToOutputDirectory="PreserveNewest" />
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<!-- Maestro.Client stopped supporting .NET 4.7.2 long ago.
This functionality should eventually be moved into an arcade-services package,
<!-- Maestro.Client stopped supporting .NET 4.7.2 long ago.
This functionality should eventually be moved into an arcade-services package,
but for users consuming other functionality we'll still support 4.7.2 by ifdefing it out. -->
<PackageReference Include="Microsoft.DotNet.Maestro.Client" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<ItemGroup>
<Compile Include="..\Common\Internal\BuildTask.cs" />
</ItemGroup>

<Import Project="$(RepositoryEngineeringDir)BuildTask.targets" />

</Project>
</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</PropertyGroup>

<Error Condition="'$(_runtimeJsonPath)'==''" Text="Could not locate '$(_runtimeJsonPath)'." />

<ItemGroup>
<None Include="$(_runtimeJsonPath)"
CopyToOutputDirectory="PreserveNewest"
Expand Down
5 changes: 3 additions & 2 deletions src/Microsoft.DotNet.Build.Tasks.Packaging/src/NuGetAssetResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,9 @@ public IReadOnlyDictionary<string, IEnumerable<ContentItemGroup>> GetAllRuntimeI

foreach (var package in _packages.Keys)
{
resolvedAssets.Add(package,
_packages[package].FindItemGroups(_conventions.Patterns.RuntimeAssemblies));
var contentItemGroups = new List<ContentItemGroup>();
_packages[package].PopulateItemGroups(_conventions.Patterns.RuntimeAssemblies, contentItemGroups);
resolvedAssets.Add(package, contentItemGroups);
}

return resolvedAssets;
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<Reference Include="System.IO.Compression" />
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="Microsoft.DotNet.NuGetRepack.Tests" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</EmbeddedResource>
<EmbeddedResource Include="Resources\TestPackageF.1.0.0-beta.12345.1.nupkg">
<LogicalName>TestPackageF.1.0.0-beta.12345.1.nupkg</LogicalName>
</EmbeddedResource>
</EmbeddedResource>
<EmbeddedResource Include="Resources\TestPackageA.1.0.0-beta-final.nupkg">
<LogicalName>TestPackageA.1.0.0-beta-final.nupkg</LogicalName>
</EmbeddedResource>
Expand Down