Skip to content

Commit 993c073

Browse files
authored
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' (#47514)
2 parents 477b0eb + 2384240 commit 993c073

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

src/SourceBuild/content/eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25065.2">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25077.4">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
7+
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

src/SourceBuild/content/eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
2424
are not necessary, and this property is removed from the file.
2525
-->
26-
<PrivateSourceBuiltSdkVersion>9.0.103</PrivateSourceBuiltSdkVersion>
27-
<PrivateSourceBuiltArtifactsVersion>9.0.103-servicing.25071.1</PrivateSourceBuiltArtifactsVersion>
26+
<PrivateSourceBuiltSdkVersion>9.0.104</PrivateSourceBuiltSdkVersion>
27+
<PrivateSourceBuiltArtifactsVersion>9.0.104-servicing.25113.1</PrivateSourceBuiltArtifactsVersion>
2828
<!-- command-line-api dependencies -->
2929
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
3030
<!-- msbuild dependencies -->

src/SourceBuild/content/global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.103"
3+
"dotnet": "9.0.104"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
77
"Microsoft.Build.Traversal": "3.4.0",
8-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2"
8+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4"
99
}
1010
}

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ Copyright (c) .NET Foundation. All rights reserved.
3232
<_FirstTargetFrameworkVersionToSupportSingleFileAnalyzer>$([MSBuild]::GetTargetFrameworkVersion('$(_FirstTargetFrameworkToSupportSingleFile)'))</_FirstTargetFrameworkVersionToSupportSingleFileAnalyzer>
3333
</PropertyGroup>
3434

35+
<ItemGroup>
36+
<ProjectCapability Condition="'$(IsAotCompatible)' == 'true'" Include="IsAotCompatible" />
37+
<ProjectCapability Condition="'$(IsTrimmable)' == 'true'" Include="IsTrimmable" />
38+
<ProjectCapability Condition="'$(PublishAot)' == 'true'" Include="PublishAot" />
39+
<ProjectCapability Condition="'$(PublishReadyToRun)' == 'true'" Include="PublishReadyToRun" />
40+
<ProjectCapability Condition="'$(PublishSingleFile)' == 'true'" Include="PublishSingleFile" />
41+
<ProjectCapability Condition="'$(PublishTrimmed)' == 'true'" Include="PublishTrimmed" />
42+
</ItemGroup>
43+
3544
<ItemDefinitionGroup>
3645
<ResolvedFileToPublish>
3746
<CopyToPublishDirectory>Always</CopyToPublishDirectory>

0 commit comments

Comments
 (0)