Skip to content
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

Jump to bottom

[main] Update dependencies from dotnet/arcade #88947

Merged
merged 1 commit into from
Jul 17, 2023
Merged

[main] Update dependencies from dotnet/arcade #88947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 36 additions & 36 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,79 +107,79 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<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>a171b61473272e5a6d272117963864ba958a012a</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23362.5">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23360.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -326,9 +326,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>b0548ed270ed98fa14ab0fcc5ef7af99fad00237</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23362.5">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23364.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<Sha>60ea5b2eca5af06fc63b250f8669d2c70179b18c</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23362.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
30 changes: 15 additions & 15 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,21 +83,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.7.23329.3</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23362.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23362.5</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23362.5</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23362.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23362.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23362.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23362.5</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23362.5</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23364.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23364.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23364.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23364.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23364.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23364.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23364.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23364.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23364.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23364.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23364.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23364.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23364.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23364.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23364.2</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdl/configure-sdl-tool.ps1
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "8.0.100-preview.6.23330.14"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23362.5",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23362.5",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23362.5",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23364.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23364.2",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23364.2",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "8.0.0-preview.7.23359.3"
Expand Down