Skip to content

Commit 7ca2245

Browse files
fix review comments & merge
1 parent cfb6fa3 commit 7ca2245

34 files changed

+530
-191
lines changed

.vsts-dotnet-ci.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,11 +533,14 @@ jobs:
533533
- job: CodeCoverage
534534
displayName: "Code Coverage"
535535
dependsOn:
536+
- IfOnlyDocumentionChanged
536537
- BootstrapMSBuildOnFullFrameworkWindows
537538
- BootstrapMSBuildOnCoreWindows
538539
- FullReleaseOnWindows
539540
- CoreBootstrappedOnLinux
540541
- CoreOnMac
542+
variables:
543+
onlyDocChanged: $[ dependencies.IfOnlyDocumentionChanged.outputs['SetIfOnlyDocumentionChangedVaribale.onlyDocChanged'] ]
541544
pool:
542545
vmImage: 'windows-2022'
543546
steps:
@@ -562,32 +565,36 @@ jobs:
562565
buildType: 'current'
563566
artifactName: 'LinuxCoreCoverage'
564567
targetPath: '$(Build.SourcesDirectory)/artifacts/TestResults/CoverageResults/LinuxCore'
568+
condition: eq(variables.onlyDocChanged, 0)
565569
- task: DownloadPipelineArtifact@2
566570
inputs:
567571
buildType: 'current'
568572
artifactName: 'MacCoreCoverage'
569573
targetPath: '$(Build.SourcesDirectory)/artifacts/TestResults/CoverageResults/MacCore'
574+
condition: eq(variables.onlyDocChanged, 0)
570575

571576
- task: PowerShell@2
572577
displayName: Process coverage reports
573578
inputs:
574579
filePath: $(Build.SourcesDirectory)\eng\process-coverage.ps1
575580
arguments: -repoRoot $(Build.SourcesDirectory) -coverageArtifactsDir $(Build.SourcesDirectory)/artifacts/CoverageResults
576581
pwsh: true
582+
condition: eq(variables.onlyDocChanged, 0)
577583
- task: PublishBuildArtifacts@1
578584
displayName: Publish Artifact $(Build.BuildNumber) Coverage
579585
inputs:
580586
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/CoverageResults/merged.coverage'
581587
ArtifactName: '$(Build.BuildNumber) Coverage'
582-
condition: succeededOrFailed()
588+
condition: and(succeededOrFailed(), eq(variables.onlyDocChanged, 0))
583589
- task: PublishBuildArtifacts@1
584590
displayName: Publish Artifact $(Build.BuildNumber) Cobertura
585591
inputs:
586592
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/CoverageResults/merged.cobertura.xml'
587593
ArtifactName: '$(Build.BuildNumber) Cobertura'
588-
condition: succeededOrFailed()
594+
condition: and(succeededOrFailed(), eq(variables.onlyDocChanged, 0))
589595
- task: PublishCodeCoverageResults@2
590596
inputs:
591597
summaryFileLocation: '$(Build.SourcesDirectory)/artifacts/CoverageResults/merged.coverage'
592598
pathToSources: $(Build.SourcesDirectory)
599+
condition: eq(variables.onlyDocChanged, 0)
593600
- template: /eng/common/templates/jobs/source-build.yml

Directory.Build.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,6 @@ ates https://learn.microsoft.com/en-gb/dotnet/fundamentals/syslib-diagnostics/sy
8484

8585
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
8686

87-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
88-
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
89-
<DirectoryPackagesPropsPath>$([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)', 'eng', 'Packages.props'))</DirectoryPackagesPropsPath>
90-
9187
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
9288
</PropertyGroup>
9389

Directory.Build.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
</ItemGroup>
1919

2020
<!-- Global Analyzer Config -->
21-
<ItemGroup Condition="'$(ProjectIsDeprecated)' != 'true'">
22-
<!-- Include Common.globalconfig for non-deprecated projects-->
21+
<ItemGroup>
2322
<EditorConfigFiles Include="$(MSBuildThisFileDirectory)eng/Common.globalconfig" />
2423
</ItemGroup>
2524

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<Project>
2+
23
<!-- Import references updated by Dependabot.
34
This file is for package references updated manually or by Darc/Maestro. -->
4-
<Import Project="dependabot\Packages.props" />
5+
<Import Project="$(RepositoryEngineeringDir)dependabot\Directory.Packages.props" />
6+
7+
<PropertyGroup>
8+
<ManagePackageVersionsCentrally Condition="'$(ManagePackageVersionsCentrally)' == ''">true</ManagePackageVersionsCentrally>
9+
<CentralPackageTransitivePinningEnabled Condition="'$(CentralPackageTransitivePinningEnabled)' == ''">true</CentralPackageTransitivePinningEnabled>
10+
</PropertyGroup>
511

612
<!--
713
Make sure to update the binding redirects (in src\MSBuild\app.config and src\MSBuild\app.amd64.config) for any changes to
@@ -43,4 +49,5 @@
4349
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="$(MicrosoftVisualStudioTelemetryVersion)" />
4450
<!-- Microsoft.VisualStudio.SolutionPersistence is maintained in eng/dependabot/Packages.props -->
4551
</ItemGroup>
52+
4653
</Project>

eng/Version.Details.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ This file should be imported by eng/Versions.props
2424
<SystemThreadingChannelsPackageVersion>9.0.11</SystemThreadingChannelsPackageVersion>
2525
<SystemThreadingTasksDataflowPackageVersion>9.0.11</SystemThreadingTasksDataflowPackageVersion>
2626
<!-- dotnet/arcade dependencies -->
27-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25555.6</MicrosoftDotNetArcadeSdkPackageVersion>
28-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25555.6</MicrosoftDotNetXUnitExtensionsPackageVersion>
27+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25605.3</MicrosoftDotNetArcadeSdkPackageVersion>
28+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25605.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
2929
<!-- nuget/nuget.client dependencies -->
3030
<NuGetBuildTasksPackageVersion>7.0.0-rc.288</NuGetBuildTasksPackageVersion>
3131
<!-- dotnet/roslyn dependencies -->
32-
<MicrosoftNetCompilersToolsetPackageVersion>5.3.0-2.25580.2</MicrosoftNetCompilersToolsetPackageVersion>
32+
<MicrosoftNetCompilersToolsetPackageVersion>5.3.0-2.25605.1</MicrosoftNetCompilersToolsetPackageVersion>
3333
</PropertyGroup>
3434
<!--Property group for alternate package version names-->
3535
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 7 additions & 7 deletions
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="msbuild" Sha="29eefe27a350eb8b0bcbababa7863a0d1086295d" BarId="293166" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="msbuild" Sha="5a69737e6f6447fe397d552503a3909ea49f6f34" BarId="293565" />
44
<ProductDependencies>
55
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
66
<Dependency Name="System.CodeDom" Version="9.0.11">
@@ -106,21 +106,21 @@
106106
</Dependency>
107107
</ProductDependencies>
108108
<ToolsetDependencies>
109-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25555.6">
109+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25605.3">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>987d1a73ea67d323c0fc7537bce8ec65d87eb43f</Sha>
111+
<Sha>774a2ef8d2777c50d047d6776ced33260822cad6</Sha>
112112
</Dependency>
113113
<Dependency Name="NuGet.Build.Tasks" Version="7.0.0-rc.288">
114114
<Uri>https://github.com/nuget/nuget.client</Uri>
115115
<Sha>5514d935e3e77d90d931758cf9e2589735b905a3</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.3.0-2.25580.2">
117+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.3.0-2.25605.1">
118118
<Uri>https://github.com/dotnet/roslyn</Uri>
119-
<Sha>c14edd18895fe53efd010d4517da332f30784df6</Sha>
119+
<Sha>9031dea89451823b7aab55f80025eee451e688f3</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25555.6">
121+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25605.3">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>987d1a73ea67d323c0fc7537bce8ec65d87eb43f</Sha>
123+
<Sha>774a2ef8d2777c50d047d6776ced33260822cad6</Sha>
124124
</Dependency>
125125
</ToolsetDependencies>
126126
</Dependencies>

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/core-templates/job/source-index-stage1.yml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/core-templates/post-build/post-build.yml

Lines changed: 13 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 27 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)