Skip to content

Commit 9966bca

Browse files
author
msftbot[bot]
authored
Merge pull request #41648 from dotnet/merges/master-to-master-vs-deps
Merge master to master-vs-deps
2 parents a5fe26a + 1a75987 commit 9966bca

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20111.11">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20112.7">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>998b715ed1fbb966437345a1996af64e22c83368</Sha>
8+
<Sha>951ea7430678b2682ff861fe1149b8a2f55887ca</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<VisualStudioEditorPackagesVersion>16.4.248</VisualStudioEditorPackagesVersion>
3434
<ILToolsPackageVersion>5.0.0-alpha1.19409.1</ILToolsPackageVersion>
3535
<MicrosoftVisualStudioLanguageServerPackagesVersion>16.3.27-develop-gdd55e997</MicrosoftVisualStudioLanguageServerPackagesVersion>
36+
<MicrosoftNetCompilersToolsetVersion>3.5.0-beta2-20074-05</MicrosoftNetCompilersToolsetVersion>
3637
</PropertyGroup>
3738
<!--
3839
Dependency versions

eng/targets/Imports.targets

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@
5050
<BypassFrameworkInstallChecks>true</BypassFrameworkInstallChecks>
5151
</PropertyGroup>
5252

53-
<!-- Add the UnitTestContainer project capability -->
54-
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
55-
<ProjectCapability Include="UnitTestContainer" />
56-
</ItemGroup>
57-
5853
<!--
5954
Do not copy dependencies to the output directory of a library project, unless it's a unit test project.
6055
-->

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"xcopy-msbuild": "16.4.0-alpha"
88
},
99
"msbuild-sdks": {
10-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20111.11"
10+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20112.7"
1111
}
1212
}

0 commit comments

Comments
 (0)