Skip to content

Commit 6aa1737

Browse files
[main] Source code updates from dotnet/dotnet (#16103)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent 876096b commit 6aa1737

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

Directory.Build.targets

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,9 @@
44
<Import Project="$(RepositoryEngineeringDir)Microsoft.DotNet.SwaggerGenerator.MSBuild.InTree.targets" Condition="'$(UsingInTreeToolSwaggerGeneratorMSBuild)' == 'true'" />
55
<Import Project="$(RepositoryEngineeringDir)BuildTask.targets" Condition="'$(IsBuildTaskProject)' == 'true'" />
66

7+
<!-- Turn on package pruning by default for every TFM except for .NET Framework. -->
8+
<PropertyGroup>
9+
<RestoreEnablePackagePruning Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">true</RestoreEnablePackagePruning>
10+
</PropertyGroup>
11+
712
</Project>

eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="c4dc56079d959dbdb7fc27ea8ad7f95194885923" BarId="280214" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="3e92251978ce669b493f159048932e690306a3bf" BarId="281912" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.1.25411.109",
3+
"version": "10.0.100-rc.1.25420.111",
44
"rollForward": "latestFeature",
55
"paths": [
66
".dotnet",
@@ -9,7 +9,7 @@
99
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
1010
},
1111
"tools": {
12-
"dotnet": "10.0.100-rc.1.25411.109"
12+
"dotnet": "10.0.100-rc.1.25420.111"
1313
},
1414
"msbuild-sdks": {
1515
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25453.1",

0 commit comments

Comments
 (0)