Skip to content

Commit 1478b7e

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#468)
* Update dependencies from https://github.com/dotnet/dotnet build 271975 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25315.102 -> 10.0.0-beta.25316.103) * Update dependencies from https://github.com/dotnet/dotnet build 272212 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25316.103 -> 10.0.0-beta.25317.107) * Update dependencies from https://github.com/dotnet/dotnet build 272322 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25317.107 -> 10.0.0-beta.25318.104) * [VMR] Codeflow 9bcfe61-3883cf7 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 272389 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25318.104 -> 10.0.0-beta.25318.105) * Update dependencies from https://github.com/dotnet/dotnet build 272596 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25318.105 -> 10.0.0-beta.25320.106) * Update dependencies from https://github.com/dotnet/dotnet build 272656 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25320.106 -> 10.0.0-beta.25320.118) * Update dependencies from https://github.com/dotnet/dotnet build 272780 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25320.118 -> 10.0.0-beta.25323.102) * Update dependencies from https://github.com/dotnet/dotnet build 272949 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25323.102 -> 10.0.0-beta.25324.103) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent ea2bdda commit 1478b7e

File tree

6 files changed

+34
-18
lines changed

6 files changed

+34
-18
lines changed

‎Directory.Build.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
<PortableBuild Condition="'$(PortableBuild)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(BuildArchitecture)' == '$(TargetArchitecture)'">false</PortableBuild>
4242
<PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
4343

44-
<PortableRid Condition="'$(PortableRid)' == '' and '$(TargetOS)' == 'freebsd'">freebsd-$(TargetArchitecture)</PortableRid>
45-
<PortableRid Condition="'$(PortableRid)' == '' and '$(TargetOS)' == 'osx'">osx-$(TargetArchitecture)</PortableRid>
46-
<PortableRid Condition="'$(PortableRid)' == '' and '$(TargetOS)' == 'linux'">linux-$(TargetArchitecture)</PortableRid>
47-
<PortableRid Condition="$(TargetRid.StartsWith('linux-musl')) or $(TargetRid.StartsWith('alpine'))">linux-musl-$(TargetArchitecture)</PortableRid>
48-
<PortableRid Condition="'$(PortableRid)' == '' and '$(TargetOS)' == 'windows'">win-$(TargetArchitecture)</PortableRid>
44+
<PortableTargetRid Condition="'$(PortableTargetRid)' == '' and '$(TargetOS)' == 'freebsd'">freebsd-$(TargetArchitecture)</PortableTargetRid>
45+
<PortableTargetRid Condition="'$(PortableTargetRid)' == '' and '$(TargetOS)' == 'osx'">osx-$(TargetArchitecture)</PortableTargetRid>
46+
<PortableTargetRid Condition="'$(PortableTargetRid)' == '' and '$(TargetOS)' == 'linux'">linux-$(TargetArchitecture)</PortableTargetRid>
47+
<PortableTargetRid Condition="$(TargetRid.StartsWith('linux-musl')) or $(TargetRid.StartsWith('alpine'))">linux-musl-$(TargetArchitecture)</PortableTargetRid>
48+
<PortableTargetRid Condition="'$(PortableTargetRid)' == '' and '$(TargetOS)' == 'windows'">win-$(TargetArchitecture)</PortableTargetRid>
4949

50-
<TargetRid Condition="'$(PortableBuild)' == 'true' and '$(PortableRid)' != ''">$(PortableRid)</TargetRid>
50+
<TargetRid Condition="'$(PortableBuild)' == 'true' and '$(PortableTargetRid)' != ''">$(PortableTargetRid)</TargetRid>
5151
</PropertyGroup>
5252

5353
<!-- Packaging properties -->

‎eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Dependencies>
2-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="deployment-tools" Sha="be8cb623e031f933b5b62e82d37094b4981dce30" BarId="271836" />
2+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="deployment-tools" Sha="0785dfdb947fe301da00b7c331d6adfdeda5b283" BarId="272949" />
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25315.102">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25324.103">
77
<Uri>https://github.com/dotnet/dotnet</Uri>
8-
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
8+
<Sha>0785dfdb947fe301da00b7c331d6adfdeda5b283</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ steps:
3030
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
3131
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
3232
useEsrpCli: true
33+
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
34+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
35+
${{ else }}:
36+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
3337
env:
3438
TeamName: $(_TeamName)
3539
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}

‎eng/common/core-templates/steps/source-build.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ steps:
3838
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
3939
fi
4040
41-
baseRidArgs=
42-
if [ '${{ parameters.platform.baseRID }}' != '' ]; then
43-
baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}'
44-
fi
45-
4641
portableBuildArgs=
4742
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
4843
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
@@ -55,7 +50,6 @@ steps:
5550
${{ parameters.platform.buildArguments }} \
5651
$internalRuntimeDownloadArgs \
5752
$targetRidArgs \
58-
$baseRidArgs \
5953
$portableBuildArgs \
6054
displayName: Build
6155

‎eng/common/templates/vmr-build-pr.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
# This pipeline is used for running the VMR verification of the PR changes in repo-level PRs.
2+
#
3+
# It will run a full set of verification jobs defined in:
4+
# https://github.com/dotnet/dotnet/blob/10060d128e3f470e77265f8490f5e4f72dae738e/eng/pipelines/templates/stages/vmr-build.yml#L27-L38
5+
#
6+
# For repos that do not need to run the full set, you would do the following:
7+
#
8+
# 1. Copy this YML file to a repo-specific location, i.e. outside of eng/common.
9+
#
10+
# 2. Add `verifications` parameter to VMR template reference
11+
#
12+
# Examples:
13+
# - For source-build stage 1 verification, add the following:
14+
# verifications: [ "source-build-stage1" ]
15+
#
16+
# - For Windows only verifications, add the following:
17+
# verifications: [ "unified-build-windows-x64", "unified-build-windows-x86" ]
18+
119
trigger: none
220
pr: none
321

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.6.25302.104",
3+
"version": "10.0.100-preview.6.25315.102",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "10.0.100-preview.6.25302.104"
8+
"dotnet": "10.0.100-preview.6.25315.102"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25315.102",
11+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25324.103",
1212
"Microsoft.Build.NoTargets": "3.7.0",
1313
"Microsoft.Build.Traversal": "3.4.0"
1414
}

0 commit comments

Comments
 (0)