Skip to content

Commit f6b5eb1

Browse files
authored
[automated] Merge branch 'release/8.0.4xx' => 'main' (#42694)
2 parents 6f01057 + 307d71b commit f6b5eb1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+86
-80
lines changed

Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
4545
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)"/>
4646
<PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
47+
<PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistPackageVersion)" />
4748
<PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
4849
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
4950
<PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />

eng/Version.Details.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,5 +652,9 @@
652652
<Sha>d304c5f6f15bcd4f34f1841b33870cfab88e6937</Sha>
653653
<SourceBuild RepoName="aspire" ManagedOnly="true" />
654654
</Dependency>
655+
<Dependency Name="Microsoft.IO.Redist" Version="6.0.1">
656+
<Uri>https://github.com/dotnet/runtime</Uri>
657+
<Sha>e77011b31a3e5c47d931248a64b47f9b2d47853d</Sha>
658+
</Dependency>
655659
</ToolsetDependencies>
656660
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
compiler API targeted by analyzer assemblies. This is mostly an issue on source-build as
2828
in that build mode analyzer assemblies always target the live compiler API. -->
2929
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</UsingToolMicrosoftNetCompilers>
30+
<MicrosoftIORedistPackageVersion>6.0.1</MicrosoftIORedistPackageVersion>
3031
</PropertyGroup>
3132
<PropertyGroup Label="Servicing version information">
3233
<VersionFeature21>30</VersionFeature21>

src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)