Skip to content

Commit 805ba9d

Browse files
authored
[release/10.0.1xx-rc1] Source code updates from dotnet/dotnet (#50403)
2 parents 11940f6 + 84e918a commit 805ba9d

File tree

66 files changed

+2718
-1492
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+2718
-1492
lines changed

Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@
108108

109109
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
110110
<SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>
111+
112+
<MicrosoftCodeAnalysisVersionForNetAnalyzers Condition="'$(DotNetBuildSourceOnly)' != 'true'">3.11.0</MicrosoftCodeAnalysisVersionForNetAnalyzers>
113+
<MicrosoftCodeAnalysisVersionForNetAnalyzers Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisVersionForNetAnalyzers>
111114
</PropertyGroup>
112115

113116
<Import Project="build/GenerateResxSource.targets" />

eng/Version.Details.props

Lines changed: 130 additions & 131 deletions
Large diffs are not rendered by default.

eng/Version.Details.xml

Lines changed: 261 additions & 261 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4545
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
4646
<!-- workload-specific version information -->
47-
<VersionFeature80ForWorkloads>$([MSBuild]::Add($(VersionFeature80), 1))</VersionFeature80ForWorkloads>
48-
<VersionFeature90ForWorkloads>$([MSBuild]::Add($(VersionFeature90), 1))</VersionFeature90ForWorkloads>
47+
<VersionFeature80ForWorkloads>$(VersionFeature80)</VersionFeature80ForWorkloads>
48+
<VersionFeature90ForWorkloads>$(VersionFeature90)</VersionFeature90ForWorkloads>
4949
</PropertyGroup>
5050
<PropertyGroup Label="Restore feeds">
5151
<!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
@@ -65,8 +65,6 @@
6565
<SystemCommandLineVersion>2.0.0-rc.1.25377.103</SystemCommandLineVersion>
6666
<SystemCommandLineNamingConventionBinderVersion>2.0.0-beta5.25279.2</SystemCommandLineNamingConventionBinderVersion>
6767
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2</MicrosoftCodeAnalysisAnalyzerTestingVersion>
68-
<MicrosoftCodeAnalysisVersionForNetAnalyzers Condition="'$(DotNetBuildSourceOnly)' != 'true'">3.11.0</MicrosoftCodeAnalysisVersionForNetAnalyzers>
69-
<MicrosoftCodeAnalysisVersionForNetAnalyzers Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisVersionForNetAnalyzers>
7068
<MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
7169
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
7270
<MicrosoftWindowsCsWin32PackageVersion>0.3.49-beta</MicrosoftWindowsCsWin32PackageVersion>

eng/common/SetupNugetSources.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# displayName: Setup Private Feeds Credentials
1111
# condition: eq(variables['Agent.OS'], 'Windows_NT')
1212
# inputs:
13-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
14-
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
13+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
14+
# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
1515
# env:
1616
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
1717
#

eng/common/SetupNugetSources.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# - task: Bash@3
1212
# displayName: Setup Internal Feeds
1313
# inputs:
14-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
15-
# arguments: $(Build.SourcesDirectory)/NuGet.config
14+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh
15+
# arguments: $(System.DefaultWorkingDirectory)/NuGet.config
1616
# condition: ne(variables['Agent.OS'], 'Windows_NT')
1717
# - task: NuGetAuthenticate@1
1818
#

eng/common/core-templates/job/job.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
inputs:
164164
testResultsFormat: 'xUnit'
165165
testResultsFiles: '*.xml'
166-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
166+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
167167
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
168168
mergeTestResults: ${{ parameters.mergeTestResults }}
169169
continueOnError: true
@@ -174,7 +174,7 @@ jobs:
174174
inputs:
175175
testResultsFormat: 'VSTest'
176176
testResultsFiles: '*.trx'
177-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
177+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
178178
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
179179
mergeTestResults: ${{ parameters.mergeTestResults }}
180180
continueOnError: true
@@ -218,7 +218,7 @@ jobs:
218218
- task: CopyFiles@2
219219
displayName: Gather buildconfiguration for build retry
220220
inputs:
221-
SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
221+
SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration'
222222
Contents: '**'
223223
TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
224224
continueOnError: true

eng/common/core-templates/job/onelocbuild.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
99
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
1010

11-
SourcesDirectory: $(Build.SourcesDirectory)
11+
SourcesDirectory: $(System.DefaultWorkingDirectory)
1212
CreatePr: true
1313
AutoCompletePr: false
1414
ReusePr: true
@@ -68,7 +68,7 @@ jobs:
6868
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
6969
- task: Powershell@2
7070
inputs:
71-
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
71+
filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1
7272
arguments: $(_GenerateLocProjectArguments)
7373
displayName: Generate LocProject.json
7474
condition: ${{ parameters.condition }}
@@ -103,7 +103,7 @@ jobs:
103103
- task: CopyFiles@2
104104
displayName: Copy LocProject.json
105105
inputs:
106-
SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/'
106+
SourceFolder: '$(System.DefaultWorkingDirectory)/eng/Localize/'
107107
Contents: 'LocProject.json'
108108
TargetFolder: '$(Build.ArtifactStagingDirectory)/loc'
109109
condition: ${{ parameters.condition }}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ parameters:
3838
# Optional: A minimatch pattern for the asset manifests to publish to BAR
3939
assetManifestsPattern: '*/manifests/**/*.xml'
4040

41+
repositoryAlias: self
42+
4143
jobs:
4244
- job: Asset_Registry_Publish
4345

@@ -78,7 +80,7 @@ jobs:
7880
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
7981

8082
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
81-
- checkout: self
83+
- checkout: ${{ parameters.repositoryAlias }}
8284
fetchDepth: 3
8385
clean: true
8486

@@ -117,7 +119,7 @@ jobs:
117119
azureSubscription: "Darc: Maestro Production"
118120
scriptType: ps
119121
scriptLocation: scriptPath
120-
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
122+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1
121123
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
122124
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
123125
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
@@ -137,7 +139,7 @@ jobs:
137139
Add-Content -Path $filePath -Value "$(DefaultChannels)"
138140
Add-Content -Path $filePath -Value $(IsStableBuild)
139141
140-
$symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
142+
$symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt"
141143
if (Test-Path -Path $symbolExclusionfile)
142144
{
143145
Write-Host "SymbolExclusionFile exists"
@@ -177,7 +179,7 @@ jobs:
177179
azureSubscription: "Darc: Maestro Production"
178180
scriptType: ps
179181
scriptLocation: scriptPath
180-
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
182+
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
181183
arguments: >
182184
-BuildId $(BARBuildId)
183185
-PublishingInfraVersion 3

eng/common/core-templates/jobs/codeql-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: DefaultGuardianVersion
2525
value: 0.109.0
2626
- name: GuardianPackagesConfigFile
27-
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
27+
value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config
2828
- name: GuardianVersion
2929
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
3030

0 commit comments

Comments
 (0)