Skip to content

Commit a6098be

Browse files
[main] Source code updates from dotnet/dotnet (#79563)
[main] Source code updates from dotnet/dotnet
1 parent ebd92a8 commit a6098be

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

eng/Publishing.props

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@
1717
<!--
1818
During PR Validation we only need to publish symbols with Arcade,
1919
since our packages are published separately to the CoreXT feed.
20+
21+
Also, do not publish any symbols packages in source-only builds.
2022
-->
2123
<Target Name="_ResolvePublishRoslynNuGetPackages"
2224
DependsOnTargets="BeforePublish"
2325
BeforeTargets="PublishToAzureDevOpsArtifacts"
24-
Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' ">
26+
Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' or '$(DotNetBuildSourceOnly)' == 'true' ">
27+
2528
<ItemGroup>
2629
<!-- Determine all NuGet packages being published -->
2730
<_NuGetPackagesToPush Include="@(ItemsToPushToBlobFeed)"
@@ -30,13 +33,25 @@
3033
<!-- Determine all symbol packages being published -->
3134
<_SymbolPackagesToPush Include="@(_NuGetPackagesToPush)"
3235
Condition="$([System.String]::Copy(%(FullPath)).EndsWith('.symbols.nupkg'))" />
36+
<_SymbolPackagesToPush Include="@(_NuGetPackagesToPush)"
37+
Condition="$([System.String]::Copy(%(FullPath)).Contains('.Symbols.'))" />
38+
</ItemGroup>
3339

40+
<ItemGroup Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' ">
3441
<!-- Remove all NuGet packages from being published -->
3542
<ItemsToPushToBlobFeed Remove="@(_NuGetPackagesToPush)" />
43+
</ItemGroup>
44+
45+
<ItemGroup Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">
46+
<!-- Remove all symbols packages from being published -->
47+
<ItemsToPushToBlobFeed Remove="@(_SymbolPackagesToPush)" />
48+
</ItemGroup>
3649

37-
<!-- Include symbol packages for publishing -->
50+
<ItemGroup Condition=" '$(PreReleaseVersionLabel)' == 'pr-validation' and '$(DotNetBuildSourceOnly)' != 'true' ">
51+
<!-- Include symbol packages for publishing-->
3852
<ItemsToPushToBlobFeed Include="@(_SymbolPackagesToPush)" />
3953
</ItemGroup>
54+
4055
</Target>
4156

4257
</Project>

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="96ac952a7886b565e83acc4c9cef656954ed0686" BarId="276277" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="c0e325f90fb79db0da6be5128dc292f2aabb264f" BarId="276450" />
44
<ProductDependencies>
55
<!-- RoslynAnalyzers reference older builds of Roslyn and this is necessary for SourceBuild. -->
66
<Dependency Name="Microsoft.CodeAnalysis" Version="3.11.0">
77
<Uri>https://github.com/dotnet/roslyn</Uri>
88
<Sha>ae1fff344d46976624e68ae17164e0607ab68b10</Sha>
99
</Dependency>
10-
<Dependency Name="System.CommandLine" Version="2.0.0-beta7.25372.103">
10+
<Dependency Name="System.CommandLine" Version="2.0.0-beta7.25373.104">
1111
<Uri>https://github.com/dotnet/dotnet</Uri>
12-
<Sha>96ac952a7886b565e83acc4c9cef656954ed0686</Sha>
12+
<Sha>c0e325f90fb79db0da6be5128dc292f2aabb264f</Sha>
1313
</Dependency>
1414
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
1515
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0">

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
Versions managed by Arcade (see Versions.Details.xml)
4949
-->
5050
<PropertyGroup>
51-
<SystemCommandLineVersion>2.0.0-beta7.25372.103</SystemCommandLineVersion>
51+
<SystemCommandLineVersion>2.0.0-beta7.25373.104</SystemCommandLineVersion>
5252
<SystemCompositionVersion>9.0.0</SystemCompositionVersion>
5353
<SystemConfigurationConfigurationManagerVersion>9.0.0</SystemConfigurationConfigurationManagerVersion>
5454
<SystemDiagnosticsEventLogVersion>9.0.0</SystemDiagnosticsEventLogVersion>

0 commit comments

Comments
 (0)