Skip to content

Commit ce90c81

Browse files
mmitchemmitche
committed
Merged PR 21744: Merge from github release/6.0
# {PR title} Summary of the changes (Less than 80 chars) ## Description {Detail} Fixes #{bug number} (in this specific format) ## Customer Impact {Justification} ## Regression? - [ ] Yes - [ ] No [If yes, specify the version the behavior has regressed from] ## Risk - [ ] High - [ ] Medium - [ ] Low [Justify the selection above] ## Verification - [ ] Manual (required) - [ ] Automated ## Packaging changes reviewed? - [ ] Yes - [ ] No - [ ] N/A ---- ## When servicing release/2.1 - [ ] Make necessary changes in eng/PatchConfig.props Merge from github release/6.0
2 parents 765af57 + 0729a7d commit ce90c81

File tree

16 files changed

+153
-110
lines changed

16 files changed

+153
-110
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,6 @@ stages:
407407
--no-build-nodejs
408408
--no-build-java
409409
-p:OnlyPackPlatformSpecificPackages=true
410-
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
411410
$(_BuildArgs)
412411
$(_InternalRuntimeDownloadArgs)
413412
displayName: Run build.sh
@@ -496,17 +495,26 @@ stages:
496495
jobName: Linux_arm64_build
497496
jobDisplayName: "Build: Linux ARM64"
498497
agentOs: Linux
499-
buildArgs:
500-
--arch arm64
501-
--all
502-
--pack
503-
--no-build-nodejs
504-
--no-build-java
505-
-p:OnlyPackPlatformSpecificPackages=true
506-
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
507-
$(_BuildArgs)
508-
$(_PublishArgs)
509-
$(_InternalRuntimeDownloadArgs)
498+
steps:
499+
- script: ./eng/build.sh
500+
--ci
501+
--arch arm64
502+
--pack
503+
--all
504+
--no-build-nodejs
505+
--no-build-java
506+
-p:OnlyPackPlatformSpecificPackages=true
507+
$(_BuildArgs)
508+
$(_InternalRuntimeDownloadArgs)
509+
displayName: Run build.sh
510+
- script: git clean -xfd src/**/obj/;
511+
./dockerbuild.sh rhel --ci --nobl --arch arm64 --build-installers --no-build-deps --no-build-nodejs
512+
-p:OnlyPackPlatformSpecificPackages=true -p:BuildRuntimeArchive=false -p:LinuxInstallerType=rpm
513+
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
514+
$(_BuildArgs)
515+
$(_PublishArgs)
516+
$(_InternalRuntimeDownloadArgs)
517+
displayName: Build RPM installers
510518
installNodeJs: false
511519
installJdk: false
512520
artifacts:

‎Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
$(MSBuildProjectName.EndsWith('.Test')) OR
3131
$(MSBuildProjectName.EndsWith('.FunctionalTest')) ) ">true</IsUnitTestProject>
3232
<IsTestAssetProject Condition=" $(RepoRelativeProjectDir.Contains('testassets')) OR $(MSBuildProjectName.Contains('TestCommon'))">true</IsTestAssetProject>
33+
<IsProjectTemplateProject Condition=" ($(RepoRelativeProjectDir.Contains('ProjectTemplates')) OR $(MSBuildProjectName.Contains('ProjectTemplates')) ) AND
34+
'$(IsUnitTestProject)' != 'true' AND
35+
'$(IsTestAssetProject)' != 'true' ">true</IsProjectTemplateProject>
3336
<IsSampleProject Condition=" $(RepoRelativeProjectDir.ToUpperInvariant().Contains('SAMPLE')) ">true</IsSampleProject>
3437
<IsAnalyzersProject Condition="$(MSBuildProjectName.EndsWith('.Analyzers'))">true</IsAnalyzersProject>
3538
<IsShipping Condition=" '$(IsSampleProject)' == 'true' OR

‎Directory.Build.targets

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
<Project>
22

33
<PropertyGroup>
4-
<!-- Only build Microsoft.AspNetCore.App, Microsoft.AspNetCore.App.Ref, and ref/ assemblies in source build. -->
4+
<!-- Only build Microsoft.AspNetCore.App, Microsoft.AspNetCore.App.Ref, ref/ assemblies, and ProjectTemplates in source build. -->
55
<!-- Analyzer package are needed in source build for WebSDK -->
66
<ExcludeFromSourceBuild
7-
Condition="'$(ExcludeFromSourceBuild)' == '' and '$(DotNetBuildFromSource)' == 'true' and '$(IsAspNetCoreApp)' != 'true' and '$(MSBuildProjectName)' != '$(TargetingPackName)' and '$(IsAnalyzersProject)' != 'true'">true</ExcludeFromSourceBuild>
7+
Condition="'$(ExcludeFromSourceBuild)' == '' and
8+
'$(DotNetBuildFromSource)' == 'true' and
9+
'$(IsAspNetCoreApp)' != 'true' and
10+
'$(MSBuildProjectName)' != '$(TargetingPackName)' and
11+
'$(IsAnalyzersProject)' != 'true' and
12+
'$(IsProjectTemplateProject)' != 'true'">true</ExcludeFromSourceBuild>
813

914
<!-- If the user has specified that they want to skip building any test related projects with SkipTestBuild,
1015
suppress all targets for TestProjects using ExcludeFromBuild. -->

‎eng/Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=arm64" />
9696
</ItemGroup>
9797

98-
<ItemGroup Condition="'$(BuildInstallers)' == 'true' AND '$(TargetRuntimeIdentifier)' == 'linux-x64'">
98+
<ItemGroup Condition="'$(BuildInstallers)' == 'true' AND ('$(TargetRuntimeIdentifier)' == 'linux-x64' OR '$(TargetRuntimeIdentifier)' == 'linux-arm64')">
9999
<ProjectToBuild Condition=" '$(LinuxInstallerType)' == 'deb' "
100100
Include="$(RepoRoot)src\Installers\Debian\**\*.*proj" />
101101
<ProjectToBuild Condition=" '$(LinuxInstallerType)' == 'rpm' "

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22122.7">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22161.1">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
285+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22122.7">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22161.1">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
290+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22122.7">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22161.1">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
294+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22122.7">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22161.1">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>7215d8265a7fbcd022eb72ff7a6e2048444c985f</Sha>
298+
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.4</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.4</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22122.7</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22122.7</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

‎eng/common/templates/job/execute-sdl.yml

Lines changed: 9 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,9 @@ jobs:
4343
value: ${{ parameters.AzDOPipelineId }}
4444
- name: AzDOBuildId
4545
value: ${{ parameters.AzDOBuildId }}
46-
# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
47-
# sync with the packages.config file.
48-
- name: DefaultGuardianVersion
49-
value: 0.110.1
46+
- template: /eng/common/templates/variables/sdl-variables.yml
5047
- name: GuardianVersion
5148
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
52-
- name: GuardianPackagesConfigFile
53-
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
5449
pool:
5550
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
5651
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
@@ -126,57 +121,11 @@ jobs:
126121
displayName: Extract Archive Artifacts
127122
continueOnError: ${{ parameters.sdlContinueOnError }}
128123

129-
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
130-
- powershell: |
131-
$content = Get-Content $(GuardianPackagesConfigFile)
132-
133-
Write-Host "packages.config content was:`n$content"
134-
135-
$content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
136-
$content | Set-Content $(GuardianPackagesConfigFile)
137-
138-
Write-Host "packages.config content updated to:`n$content"
139-
displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
140-
141-
- task: NuGetToolInstaller@1
142-
displayName: 'Install NuGet.exe'
143-
- task: NuGetCommand@2
144-
displayName: 'Install Guardian'
145-
inputs:
146-
restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
147-
feedsToUse: config
148-
nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
149-
externalFeedCredentials: GuardianConnect
150-
restoreDirectory: $(Build.SourcesDirectory)\.packages
151-
152-
- ${{ if ne(parameters.overrideParameters, '') }}:
153-
- powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
154-
displayName: Execute SDL
155-
continueOnError: ${{ parameters.sdlContinueOnError }}
156-
- ${{ if eq(parameters.overrideParameters, '') }}:
157-
- powershell: ${{ parameters.executeAllSdlToolsScript }}
158-
-GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
159-
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
160-
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
161-
${{ parameters.additionalParameters }}
162-
displayName: Execute SDL
163-
continueOnError: ${{ parameters.sdlContinueOnError }}
164-
165-
- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
166-
# We want to publish the Guardian results and configuration for easy diagnosis. However, the
167-
# '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
168-
# tooling files. Some of these files are large and aren't useful during an investigation, so
169-
# exclude them by simply deleting them before publishing. (As of writing, there is no documented
170-
# way to selectively exclude a dir from the pipeline artifact publish task.)
171-
- task: DeleteFiles@1
172-
displayName: Delete Guardian dependencies to avoid uploading
173-
inputs:
174-
SourceFolder: $(Agent.BuildDirectory)/.gdn
175-
Contents: |
176-
c
177-
i
178-
condition: succeededOrFailed()
179-
- publish: $(Agent.BuildDirectory)/.gdn
180-
artifact: GuardianConfiguration
181-
displayName: Publish GuardianConfiguration
182-
condition: succeededOrFailed()
124+
- template: /eng/common/templates/steps/execute-sdl.yml
125+
parameters:
126+
overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }}
127+
executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }}
128+
overrideParameters: ${{ parameters.overrideParameters }}
129+
additionalParameters: ${{ parameters.additionalParameters }}
130+
publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }}
131+
sdlContinueOnError: ${{ parameters.sdlContinueOnError }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
2222
# sync with the packages.config file.
2323
- name: DefaultGuardianVersion
24-
value: 0.109.0
24+
value: 0.110.1
2525
- name: GuardianPackagesConfigFile
2626
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
2727
- name: GuardianVersion

‎eng/common/templates/steps/execute-sdl.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
parameters:
2+
overrideGuardianVersion: ''
3+
executeAllSdlToolsScript: ''
4+
overrideParameters: ''
5+
additionalParameters: ''
6+
publishGuardianDirectoryToPipeline: false
7+
sdlContinueOnError: false
8+
condition: ''
9+
10+
steps:
11+
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
12+
- powershell: |
13+
$content = Get-Content $(GuardianPackagesConfigFile)
14+
15+
Write-Host "packages.config content was:`n$content"
16+
17+
$content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
18+
$content | Set-Content $(GuardianPackagesConfigFile)
19+
20+
Write-Host "packages.config content updated to:`n$content"
21+
displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
22+
23+
- task: NuGetToolInstaller@1
24+
displayName: 'Install NuGet.exe'
25+
26+
- task: NuGetCommand@2
27+
displayName: 'Install Guardian'
28+
inputs:
29+
restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
30+
feedsToUse: config
31+
nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
32+
externalFeedCredentials: GuardianConnect
33+
restoreDirectory: $(Build.SourcesDirectory)\.packages
34+
35+
- ${{ if ne(parameters.overrideParameters, '') }}:
36+
- powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
37+
displayName: Execute SDL
38+
continueOnError: ${{ parameters.sdlContinueOnError }}
39+
condition: ${{ parameters.condition }}
40+
41+
- ${{ if eq(parameters.overrideParameters, '') }}:
42+
- powershell: ${{ parameters.executeAllSdlToolsScript }}
43+
-GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
44+
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
45+
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
46+
${{ parameters.additionalParameters }}
47+
displayName: Execute SDL
48+
continueOnError: ${{ parameters.sdlContinueOnError }}
49+
condition: ${{ parameters.condition }}
50+
51+
- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}:
52+
# We want to publish the Guardian results and configuration for easy diagnosis. However, the
53+
# '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default
54+
# tooling files. Some of these files are large and aren't useful during an investigation, so
55+
# exclude them by simply deleting them before publishing. (As of writing, there is no documented
56+
# way to selectively exclude a dir from the pipeline artifact publish task.)
57+
- task: DeleteFiles@1
58+
displayName: Delete Guardian dependencies to avoid uploading
59+
inputs:
60+
SourceFolder: $(Agent.BuildDirectory)/.gdn
61+
Contents: |
62+
c
63+
i
64+
condition: succeededOrFailed()
65+
- publish: $(Agent.BuildDirectory)/.gdn
66+
artifact: GuardianConfiguration
67+
displayName: Publish GuardianConfiguration
68+
condition: succeededOrFailed()

‎eng/common/templates/variables/sdl-variables.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
variables:
2+
# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in
3+
# sync with the packages.config file.
4+
- name: DefaultGuardianVersion
5+
value: 0.110.1
6+
- name: GuardianPackagesConfigFile
7+
value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config

0 commit comments

Comments
 (0)