mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge in 'release/8.0.3xx' changes

Browse source
This commit is contained in:
dotnet-bot 2024-06-05 14:32:29 +00:00
commit 7bfd30c254
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.config/dotnet-tools.json
View file

@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"microsoft.dotnet.darc": {
"version": "1.1.0-beta.24303.4",
"version": "1.1.0-beta.24304.5",
"commands": [
"darc"
]

8
eng/Version.Details.xml
View file

@ -227,13 +227,13 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f2b2071632d5d4c46d0f904f2b0d917b1752551b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24303.4">
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24304.5">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>1dafa0baedec752ebd1dfcae5b09cc87c8117967</Sha>
<Sha>98b07ca56bb578f2bd9225a5fc97f34b0c25b5f3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24303.4">
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24304.5">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>1dafa0baedec752ebd1dfcae5b09cc87c8117967</Sha>
<Sha>98b07ca56bb578f2bd9225a5fc97f34b0c25b5f3</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
<Uri>https://github.com/dotnet/runtime</Uri>

2
eng/Versions.props
View file

@ -43,7 +43,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24303.4</MicrosoftDotNetDarcLibVersion>
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24304.5</MicrosoftDotNetDarcLibVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

2
src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs
View file

@ -150,7 +150,7 @@ public class LicenseScanTests : TestBase
string ignoreOptions = string.Join(" ", s_ignoredFilePatterns.Select(pattern => $"--ignore {pattern}"));
ExecuteHelper.ExecuteProcessValidateExitCode(
"scancode",
$"--license --strip-root --only-findings {ignoreOptions} --json-pp {scancodeResultsPath} {Config.LicenseScanPath}",
$"--license --processes 4 --strip-root --only-findings {ignoreOptions} --json-pp {scancodeResultsPath} {Config.LicenseScanPath}",
OutputHelper);
JsonDocument doc = JsonDocument.Parse(File.ReadAllText(scancodeResultsPath));