Skip to content

Commit c25347e

Browse files
authored
[xcode26.0] Merge main into xcode26.0 (#23709)
2 parents 930eff2 + 49dfebd commit c25347e

File tree

5 files changed

+24
-6
lines changed

5 files changed

+24
-6
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: branch_classification
2+
resource: repository
3+
disabled: false
4+
where:
5+
configuration:
6+
branchClassificationSettings:
7+
defaultClassification: nonproduction
8+
ruleset:
9+
- name: prod-branches
10+
branchNames:
11+
- main
12+
- release-test/*
13+
- release/*
14+
- net7.0
15+
- net8.0
16+
- net9.0
17+
- net10.0
18+
- xcode*
19+
classification: production

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ This file should be imported by eng/Versions.props
3939
<!-- dotnet/templating dependencies -->
4040
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksPackageVersion>
4141
<!-- dotnet/xharness dependencies -->
42-
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.25412.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
42+
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.25427.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
4343
</PropertyGroup>
4444
<!--Property group for alternate package version names-->
4545
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@
9595
<Uri>https://github.com/dotnet/templating</Uri>
9696
<Sha />
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25412.1">
98+
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25427.1">
9999
<Uri>https://github.com/dotnet/xharness</Uri>
100-
<Sha>fe850ca677efa9ed62009b929f55ff59d5e24c0e</Sha>
100+
<Sha>dbb478b6aafa222529ae95be344a1b91485c4adf</Sha>
101101
</Dependency>
102102
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25415.3">
103103
<Uri>https://github.com/dotnet/arcade</Uri>

tools/devops/automation/templates/governance/apiscan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ steps:
7272
toolVersion: 'Latest'
7373
verbosityLevel: standard
7474
preserveLogsFolder: true
75+
azureSubscription: 'VSEng-APIScanSC'
7576
env:
76-
AzureServicesAuthConnectionString: RunAs=App;AppId=$(CLIENT_ID)
7777
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
7878

7979
- task: PublishSecurityAnalysisLogs@3

tools/devops/automation/templates/release/vs-insertion-prep.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,9 @@ stages:
5050

5151
jobs:
5252
# Check - "xamarin-macios (Prepare Release Sign NuGets)"
53-
- template: sign-artifacts/jobs/v2.yml@yaml-templates
53+
- template: sign-artifacts/jobs/v4.yml@yaml-templates
5454
parameters:
5555
timeoutInMinutes: 120
56-
use1ESTemplate: true
5756
uploadBinlogs: true
5857
uploadPrefix: ${{ parameters.uploadPrefix }}
5958
enabledCredScan: false

0 commit comments

Comments
 (0)