Skip to content

Commit 6281886

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[main] Source code updates from dotnet/dotnet (#371)
* Update dependencies from https://github.com/dotnet/dotnet build 290774 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25476.104 -> 10.0.0-beta.25563.104) * Migrate to slnx * Add files for VMR publishing & branch flow * Small formatting --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent cca7146 commit 6281886

20 files changed

Lines changed: 279 additions & 303 deletions

‎.github/workflows/backport.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Backport PR to branch
2+
on:
3+
issue_comment:
4+
types: [created]
5+
schedule:
6+
# once a day at 13:00 UTC to cleanup old runs
7+
- cron: '0 13 * * *'
8+
9+
permissions:
10+
contents: write
11+
issues: write
12+
pull-requests: write
13+
actions: write
14+
15+
jobs:
16+
backport:
17+
uses: dotnet/arcade/.github/workflows/backport-base.yml@main

‎.github/workflows/inter-branch-merge-flow.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Inter-branch merge workflow
2+
on:
3+
push:
4+
branches:
5+
- release/**
6+
7+
permissions:
8+
contents: write
9+
pull-requests: write
10+
11+
jobs:
12+
Merge:
13+
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main

‎SymReader.sln‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎azure-pipelines.yml‎

Lines changed: 17 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -1,147 +1,41 @@
1+
variables:
2+
- name: _PublishUsingPipelines
3+
value: false
4+
- template: /eng/common/templates-official/variables/pool-providers.yml@self
5+
16
trigger:
27
batch: true
38
branches:
49
include:
5-
- main
6-
7-
variables:
8-
- template: /eng/common/templates-official/variables/pool-providers.yml@self
9-
- name: TeamName
10-
value: Roslyn
10+
- main
11+
- release/*
1112

12-
schedules:
13-
- cron: "0 8 22-28 * 0" # Fourth Sunday of each month at 8:00 UTC
14-
displayName: "Monthly build check"
15-
branches:
16-
include:
17-
- main
18-
- release/*
19-
always: true # Run even if there have been no source code changes since the last successful scheduled run
20-
batch: false # Do not run the pipeline if the previously scheduled run is in-progress
13+
pr: none
2114

2215
resources:
2316
repositories:
24-
- repository: MicroBuildTemplate
17+
- repository: 1ESPipelineTemplates
2518
type: git
26-
name: 1ESPipelineTemplates/MicroBuildTemplate
19+
name: 1ESPipelineTemplates/1ESPipelineTemplates
2720
ref: refs/tags/release
2821
extends:
29-
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
22+
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
3023
parameters:
3124
sdl:
25+
createAdoIssuesForJustificationsForDisablement: false
3226
sourceAnalysisPool:
3327
name: $(DncEngInternalBuildPool)
3428
image: 1es-windows-2022
3529
os: windows
36-
policheck:
37-
enabled: true
38-
binskim:
39-
enabled: true
40-
tsa:
41-
enabled: true
42-
configFile: '$(Build.SourcesDirectory)/eng/tsaconfig.gdntsa'
43-
pool:
44-
name: AzurePipelines-EO
45-
image: AzurePipelinesWindows2022compliantGPT
46-
os: windows
47-
customBuildTags:
48-
- ES365AIMigrationTooling
4930
stages:
5031
- stage: build
5132
displayName: Build
5233
jobs:
5334
- template: /eng/common/templates-official/jobs/jobs.yml@self
5435
parameters:
55-
enableMicrobuild: true
5636
enablePublishBuildArtifacts: true
57-
enablePublishTestResults: true
58-
enablePublishBuildAssets: true
59-
enablePublishUsingPipelines: true
60-
enableTelemetry: true
61-
enableSourceBuild: true
62-
helixRepo: dotnet/symreader
63-
jobs:
64-
- job: Windows
65-
pool:
66-
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
67-
vmImage: 'windows-latest'
68-
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
69-
name: $(DncEngInternalBuildPool)
70-
demands: ImageOverride -equals 1es-windows-2022
71-
variables:
72-
# Only enable publishing in official builds
73-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
74-
# Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
75-
- group: Publish-Build-Assets
76-
- name: _OfficialBuildArgs
77-
value: /p:DotNetSignType=$(_SignType)
78-
/p:TeamName=$(TeamName)
79-
/p:DotNetPublishUsingPipelines=true
80-
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
81-
# else
82-
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
83-
- name: _OfficialBuildArgs
84-
value: ''
85-
strategy:
86-
matrix:
87-
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
88-
Debug:
89-
_BuildConfig: Debug
90-
_SignType: test
91-
_BuildArgs: ''
92-
Release:
93-
_BuildConfig: Release
94-
# PRs or external builds are not signed.
95-
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
96-
_SignType: test
97-
_BuildArgs: ''
98-
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
99-
_SignType: real
100-
_BuildArgs: $(_OfficialBuildArgs)
101-
steps:
102-
- checkout: self
103-
clean: true
104-
- script: eng\common\cibuild.cmd -configuration $(_BuildConfig) -prepareMachine $(_BuildArgs)
105-
displayName: Build and Test
106-
107-
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
108-
- job: MacOS
109-
displayName: 'MacOS'
110-
pool:
111-
vmImage: 'macOS-latest'
112-
strategy:
113-
matrix:
114-
Debug:
115-
_BuildConfig: Debug
116-
_SignType: none
117-
Release:
118-
_BuildConfig: Release
119-
_SignType: none
120-
steps:
121-
- checkout: self
122-
clean: true
123-
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine
124-
displayName: Build and Test
125-
126-
- job: Linux
127-
displayName: 'Linux'
128-
pool:
129-
vmImage: 'ubuntu-latest'
130-
strategy:
131-
matrix:
132-
Debug:
133-
_BuildConfig: Debug
134-
_SignType: none
135-
Release:
136-
_BuildConfig: Release
137-
_SignType: none
138-
steps:
139-
- checkout: self
140-
clean: true
141-
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine
142-
displayName: Build and Test
143-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
144-
- template: /eng/common/templates-official/post-build/post-build.yml@self
145-
parameters:
146-
publishingInfraVersion: 3
147-
enableSymbolValidation: false
37+
enablePublishBuildAssets: false
38+
enablePublishTestResults: false
39+
publishAssetsImmediately: true
40+
isAssetlessBuild: true
41+
enableTelemetry: true

‎eng/Publishing.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<Project>
22

3+
<PropertyGroup>
4+
<ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
5+
</PropertyGroup>
6+
37
<!-- Update Artifacts with Kind=Package to have additional metadata item Category="ToolingPackage".
48
Depending on channel configuration, this means that these assets could be pushed to a different feed. -->
59
<ItemGroup>

‎eng/Signing.props‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<Project>
2+
3+
<PropertyGroup>
4+
<UseDotNetCertificate>true</UseDotNetCertificate>
5+
</PropertyGroup>
6+
27
<ItemGroup>
38
<FileSignInfo Include="Microsoft.DiaSymReader.dll" PublicKeyToken="31bf3856ad364e35" TargetFramework=".NETFramework,Version=v2.0" CertificateName="MicrosoftWin8WinBlue"/>
49
<FileSignInfo Include="Microsoft.DiaSymReader.dll" PublicKeyToken="31bf3856ad364e35" TargetFramework=".NETStandard,Version=v1.1" CertificateName="Microsoft101240624"/>
510
</ItemGroup>
611

7-
<PropertyGroup>
8-
<UseDotNetCertificate>true</UseDotNetCertificate>
9-
</PropertyGroup>
1012
</Project>

‎eng/Version.Details.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25476.104</MicrosoftDotNetArcadeSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25563.104</MicrosoftDotNetArcadeSdkPackageVersion>
1010
</PropertyGroup>
1111
<!--Property group for alternate package version names-->
1212
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="symreader" Sha="e1eaf1bbd9702e9b6ee9b10dbc94105732e07896" BarId="284895" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="symreader" Sha="93970af2dae989c795efb703be9a25ff95079f25" BarId="290774" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25476.104">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25563.104">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>e1eaf1bbd9702e9b6ee9b10dbc94105732e07896</Sha>
9+
<Sha>93970af2dae989c795efb703be9a25ff95079f25</Sha>
1010
</Dependency>
1111
</ToolsetDependencies>
1212
</Dependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<Project>
2-
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
2+
3+
<Import Project="Version.Details.props" />
4+
35
<PropertyGroup>
46
<!-- This repo version -->
57
<VersionPrefix>2.2.0</VersionPrefix>
68
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
79
<!-- Opt-in/out repo features -->
810
<UsingToolPdbConverter>false</UsingToolPdbConverter>
911
<UsingToolNuGetRepack>true</UsingToolNuGetRepack>
10-
<FlagNetStandard1XDependencies>true</FlagNetStandard1XDependencies>
1112
</PropertyGroup>
13+
1214
</Project>

0 commit comments

Comments
 (0)