Skip to content

Commit 31dc22e

Browse files
ViktorHoferViktorHofer
authored
Merge branch 'main' into makeRoslynToolsetPackageSelectionCommon
2 parents d992891 + 8a21d16 commit 31dc22e

File tree

420 files changed

+18738
-23855
lines changed

Some content is hidden

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

420 files changed

+18738
-23855
lines changed

‎.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.25105.4",
6+
"version": "1.1.0-beta.25118.2",
77
"commands": [
88
"darc"
99
]

‎.github/workflows/add-lockdown-label.yml

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: Add Branch Lockdown Label to PRs
2+
3+
on:
4+
pull_request_target:
5+
workflow_dispatch: # Allows manual triggering of the workflow
6+
7+
permissions:
8+
actions: write # For managing the operation state cache
9+
issues: write
10+
11+
jobs:
12+
add-label:
13+
runs-on: ubuntu-latest
14+
15+
permissions:
16+
contents: read
17+
pull-requests: write
18+
19+
steps:
20+
- name: Checkout repository
21+
uses: actions/checkout@v2
22+
23+
- name: Install jq
24+
run: sudo apt-get install -y jq
25+
26+
- name: Add label to PRs
27+
env:
28+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29+
run: |
30+
# Determine the third Tuesday of the current month
31+
third_tuesday=$(date -d "$(date +%Y-%m-01) +14 days" +%Y-%m-%d)
32+
while [ $(date -d "$third_tuesday" +%u) -ne 2 ]; do
33+
third_tuesday=$(date -d "$third_tuesday + 1 day" +%Y-%m-%d)
34+
done
35+
36+
# Determine the first Tuesday of the current month
37+
first_tuesday=$(date -d "$(date +%Y-%m-01)" +%Y-%m-%d)
38+
while [ $(date -d "$first_tuesday" +%u) -ne 2 ]; do
39+
first_tuesday=$(date -d "$first_tuesday + 1 day" +%Y-%m-%d)
40+
done
41+
42+
# Get current date
43+
current_date=$(date +%Y-%m-%d)
44+
45+
echo "Current Date: $current_date"
46+
echo "Third Tuesday of the month: $third_tuesday"
47+
echo "First Tuesday of the month: $first_tuesday"
48+
49+
# Check if the current date is after the third Tuesday of this month or before the first Tuesday of this month
50+
if [[ "$current_date" > "$third_tuesday" || "$current_date" < "$first_tuesday" ]]; then
51+
echo "Within the label period. Checking if the branch matches..."
52+
53+
# Get all open PRs targeting branches release/8* and release/9* excluding release/9.0.3xx
54+
echo "Running gh pr list query..."
55+
prs=$(gh pr list --state open --limit 200 --json number,baseRefName,author,labels)
56+
echo "Total PRs Count: $(echo "$prs" | jq length)"
57+
echo "PRs JSON: $prs"
58+
59+
echo "Filtering PRs targeting release/8* and release/9* excluding release/9.0.3xx..."
60+
prs_targeting_branches=$(echo "$prs" | jq '[.[] | select(.baseRefName | test("^release/[89].*")) | select(.baseRefName | test("^release/9.0.3xx") | not)]')
61+
echo "Count of PRs targeting specific branches: $(echo "$prs_targeting_branches" | jq length)"
62+
63+
echo "Filtering PRs without Branch Lockdown label..."
64+
filtered_prs=$(echo "$prs_targeting_branches" | jq '[.[] | select(.labels | map(.name) | index("Branch Lockdown") | not) | .number]')
65+
echo "Filtered PRs without Branch Lockdown label JSON: $filtered_prs"
66+
echo "Count of Filtered PRs without Branch Lockdown label: $(echo "$filtered_prs" | jq length)"
67+
68+
# Loop through filtered PRs and add label
69+
for pr in $(echo "$filtered_prs" | jq -r '.[]'); do
70+
echo "Adding label to PR #$pr"
71+
gh pr edit $pr --add-label "Branch Lockdown"
72+
done
73+
else
74+
echo "Outside the label period. No labels added."
75+
fi

‎.vsts-ci.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ trigger:
55
branches:
66
include:
77
- main
8-
- release/9.0.3xx
8+
- release/10.0.1xx-*
99
- internal/release/*
1010
- exp/*
1111

@@ -212,6 +212,14 @@ extends:
212212
officialBuildProperties: $(_officialBuildProperties)
213213
osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true
214214
runTests: false
215+
- categoryName: Portable
216+
buildArchitecture: arm64
217+
runtimeIdentifier: linux-arm64
218+
# Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
219+
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true
220+
officialBuildProperties: $(_officialBuildProperties)
221+
osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true
222+
runTests: false
215223
- categoryName: Portable
216224
container: centosStream9
217225
# Do not publish zips and tarballs. The linux-x64 binaries are already published by Official.

‎.vsts-pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ stages:
5050
name: $(DncEngPublicBuildPool)
5151
demands: ImageOverride -equals windows.vs2022.amd64.open
5252
os: windows
53-
helixTargetQueue: windows.amd64.vs2022.pre.scout.open
53+
helixTargetQueue: windows.amd64.vs2022.pre.open
5454

5555
############### LINUX ###############
5656
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml

‎CODEOWNERS

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@
6666
# ILLink and ReadyToRun targets and tasks owned by runtime team
6767
# Area-ILLink Area-ReadyToRun
6868
/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets @dotnet/illink
69-
/src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs @AntonLapounov
70-
/src/Tasks/Microsoft.NET.Build.Tasks/RunReadyToRunCompiler.cs @AntonLapounov
69+
/src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs @dotnet/area-type-system-and-startup
70+
/src/Tasks/Microsoft.NET.Build.Tasks/RunReadyToRunCompiler.cs @dotnet/area-type-system-and-startup
7171
/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @dotnet/illink
72-
/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishReadyToRun.cs @AntonLapounov
72+
/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishReadyToRun.cs @dotnet/area-type-system-and-startup
7373
# Publish.targets related to ILLink and ReadyToRun is own by both runtime and SDK team
74-
/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @dotnet/illink @AntonLapounov @dotnet/dotnet-cli
74+
/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @dotnet/illink @dotnet/area-type-system-and-startup @dotnet/dotnet-cli
7575
# Area-ClickOnce
7676
/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak
7777

‎Directory.Build.props

+36-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,40 @@
2222
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
2323
<Import Project="$(RepositoryEngineeringDir)Analyzers.props" />
2424

25-
<PropertyGroup Condition="'$(PgoInstrument)' == 'true'">
26-
<SkipBuildingInstallers>true</SkipBuildingInstallers>
27-
<PgoTerm>-pgo</PgoTerm>
25+
<PropertyGroup>
26+
<!-- Use current machine distro RID if set. Otherwise, fall back to RuntimeInformation.RuntimeIdentifier -->
27+
<HostRid Condition="'$(HostRid)' == '' and '$(MSBuildRuntimeType)' == 'core'">$(__DistroRid)</HostRid>
28+
<HostRid Condition="'$(HostRid)' == '' and '$(MSBuildRuntimeType)' == 'core'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</HostRid>
29+
<HostRid Condition="'$(HostRid)' == '' and '$(MSBuildRuntimeType)' != 'core'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</HostRid>
30+
31+
<IsLinux Condition="$([MSBuild]::IsOSPlatform('LINUX'))">true</IsLinux>
32+
<HostOSName Condition="'$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('WINDOWS'))">win</HostOSName>
33+
<HostOSName Condition="'$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('OSX'))">osx</HostOSName>
34+
<HostOSName Condition="'$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('FREEBSD'))">freebsd</HostOSName>
35+
<HostOSName Condition="'$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('ILLUMOS'))">illumos</HostOSName>
36+
<HostOSName Condition="'$(HostOSName)' == '' AND '$(IsLinux)' == 'true'">linux</HostOSName>
37+
38+
<IsDebianBaseDistro Condition="$(HostRid.StartsWith('ubuntu')) OR $(HostRid.StartsWith('debian'))">true</IsDebianBaseDistro>
39+
<IsRPMBasedDistro Condition="$(HostRid.StartsWith('rhel'))">true</IsRPMBasedDistro>
40+
<IsRPMBasedDistro Condition="$(HostRid.StartsWith('centos'))">true</IsRPMBasedDistro>
41+
</PropertyGroup>
42+
43+
<PropertyGroup>
44+
<ArchiveExtension>.tar.gz</ArchiveExtension>
45+
<ArchiveExtension Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">.zip</ArchiveExtension>
46+
47+
<InstallerExtension Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">.msi</InstallerExtension>
48+
<InstallerExtension Condition="$([MSBuild]::IsOSPlatform('OSX'))">.pkg</InstallerExtension>
49+
<InstallerExtension Condition="'$(IsDebianBaseDistro)' == 'true'">.deb</InstallerExtension>
50+
<InstallerExtension Condition="'$(IsRPMBasedDistro)' == 'true'">.rpm</InstallerExtension>
51+
52+
<BundleExtension Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">.exe</BundleExtension>
53+
<BundleExtension Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(InstallerExtension)</BundleExtension>
54+
<BundleExtension Condition="'$(IsDebianBaseDistro)' == 'true'">$(InstallerExtension)</BundleExtension>
55+
<BundleExtension Condition="'$(IsRPMBasedDistro)' == 'true'">$(InstallerExtension)</BundleExtension>
56+
57+
<ExeExtension>.exe</ExeExtension>
58+
<ExeExtension Condition="!$([MSBuild]::IsOSPlatform('WINDOWS'))"></ExeExtension>
2859
</PropertyGroup>
2960

3061
<PropertyGroup>
@@ -61,6 +92,8 @@
6192

6293
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
6394
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
95+
96+
<SdkLayoutOutputDirectory>$(ArtifactsBinDir)redist\$(Configuration)\layouts\dotnet-toolset-internal\</SdkLayoutOutputDirectory>
6497
</PropertyGroup>
6598

6699
<PropertyGroup Condition="'$(IsTestProject)' == 'true'">

‎Directory.Packages.props

-4
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<PackageVersion Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" />
9696
<PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
9797
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
98-
<PackageVersion Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
9998
<PackageVersion Include="System.Composition.AttributedModel" Version="$(SystemCompositionAttributedModelPackageVersion)" />
10099
<PackageVersion Include="System.Composition.Convention" Version="$(SystemCompositionConventionPackageVersion)" />
101100
<PackageVersion Include="System.Composition.Hosting" Version="$(SystemCompositionHostingPackageVersion)" />
@@ -104,14 +103,11 @@
104103
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
105104
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
106105
<PackageVersion Include="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />
107-
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
108106
<!-- System.Reflection.Metadata and System.Collections.Immutable cannot be pinned here because of hard dependencies within Roslyn on specific versions that have to work both here and in VS -->
109107
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="$(SystemReflectionMetadataLoadContextVersion)" />
110108
<PackageVersion Include="System.Resources.Extensions" Version="$(SystemResourcesExtensionsPackageVersion)" />
111-
<PackageVersion Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
112109
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersion)" />
113110
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="$(SystemSecurityCryptographyProtectedDataPackageVersion)" />
114-
<PackageVersion Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
115111
<PackageVersion Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" />
116112
<PackageVersion Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" />
117113
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerVersion)" />

0 commit comments

Comments
 (0)