Skip to content

Commit 27fd588

Browse files
authored
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#42650)
2 parents 1816d2a + bd6ef17 commit 27fd588

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
4040
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)"/>
4141
<PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
42+
<PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistPackageVersion)" />
4243
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
4344
<PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
4445
<PackageVersion Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)" />

eng/Version.Details.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,5 +509,9 @@
509509
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
510510
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
511511
</Dependency>
512+
<Dependency Name="Microsoft.IO.Redist" Version="6.0.1">
513+
<Uri>https://github.com/dotnet/runtime</Uri>
514+
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
515+
</Dependency>
512516
</ToolsetDependencies>
513517
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
2323
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">
2424
</PreReleaseVersionIteration>
25+
<MicrosoftIORedistPackageVersion>6.0.1</MicrosoftIORedistPackageVersion>
2526
</PropertyGroup>
2627
<!-- Production Dependencies -->
2728
<PropertyGroup>

src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage
1010
</TargetsForTfmSpecificBuildOutput>
1111

12-
<!-- Tell the SDK to generate a deps.json file -->
13-
<GenerateDependencyFile>true</GenerateDependencyFile>
12+
<!-- Tell the SDK to generate a deps.json file to be used by .NET SDK MSBuild -->
13+
<GenerateDependencyFile Condition=" '$(TargetFramework)' != 'net472'">true</GenerateDependencyFile>
1414

1515
<!-- Allow the packaging project to use the name `Microsoft.NET.Build.Containers` for the nuget package -->
1616
<Packageid>.</Packageid>

0 commit comments

Comments
 (0)