Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (#4606)
Browse files Browse the repository at this point in the history
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
dotnet-maestro[bot] and dotnet-maestro[bot] authored Jul 18, 2023
1 parent 6b9da69 commit c9ce3dd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23360.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>226c103b56a979243f08032e6cddb4deb66ea54b</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-3.23315.4">
Expand All @@ -48,14 +48,14 @@
<Uri>https://github.com/dotnet/symreader-converter</Uri>
<Sha>c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23326.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23360.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>10a822a79bde97ca45faa76dc4ec33b85533728a</Sha>
<Sha>a171b61473272e5a6d272117963864ba958a012a</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23358.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23361.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>d65917a564ce5d2b75fc387a7f4d0bcc6bdd269d</Sha>
<Sha>d2e046aec870a5a7601cc51c5607f34463cc2d42</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdl/configure-sdl-tool.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ try {
}
'binskim' {
if ($targetDirectory) {
$tool.Args += "`"Target < $TargetDirectory`""
$tool.Args += "`"Target < $TargetDirectory\**`""
}
$tool.Args += $BinskimAdditionalRunConfigParams
}
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100-preview.5.23303.2",
"version": "8.0.100-preview.6.23330.14",
"rollForward": "minor",
"allowPrerelease": false,
"architecture": "x64"
Expand Down Expand Up @@ -29,10 +29,10 @@
"allowPrerelease": false
},
"vswhere": "2.2.7",
"dotnet": "8.0.100-preview.5.23303.2"
"dotnet": "8.0.100-preview.6.23330.14"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23360.1",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23364.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23226.4"
}
}

0 comments on commit c9ce3dd

Please sign in to comment.