Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7ea9cf1

Browse files
[main] Update dependencies from dotnet/arcade (#375)
1 parentedff54c commit7ea9cf1

File tree

8 files changed

+53
-11
lines changed

8 files changed

+53
-11
lines changed

‎eng/Signing.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</PropertyGroup>
55

66
<ItemGroupCondition="'$(RID)' == 'win-x86'">
7-
<FileExtensionSignInfoInclude=".msi;.wixpdb"CertificateName="MicrosoftDotNet500" />
7+
<FileExtensionSignInfoInclude=".wixpdb"CertificateName="MicrosoftDotNet500" />
88
<ItemsToSignInclude="$(ArtifactsShippingPackagesDir)**\*.wixpack.zip;
99
$(ArtifactsDir)packages\**\dotnet-core-uninstall*.msi;" />
1010
</ItemGroup>

‎eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<DependencyName="Microsoft.DotNet.Arcade.Sdk"Version="10.0.0-beta.25164.6">
6+
<DependencyName="Microsoft.DotNet.Arcade.Sdk"Version="10.0.0-beta.25171.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>1912d9f4fc410d421a01b5a09131aae234b603fa</Sha>
8+
<Sha>235443a5c1136571cacdfd40576f263f26bf5b9b</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/CIBuild.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@echooff
2-
powershell -ExecutionPolicy ByPass -NoProfile -command"&"""%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci%*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command"&"""%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci%*"

‎eng/common/build.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Param(
77
[string]$msbuildEngine=$null,
88
[bool]$warnAsError=$true,
99
[bool]$nodeReuse=$true,
10+
[switch]$buildCheck=$false,
1011
[switch][Alias('r')]$restore,
1112
[switch]$deployDeps,
1213
[switch][Alias('b')]$build,
@@ -71,6 +72,8 @@ function Print-Usage() {
7172
Write-Host" -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
7273
Write-Host" -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
7374
Write-Host" -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
75+
Write-Host" -nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
76+
Write-Host" -buildCheck Sets /check msbuild parameter"
7477
Write-Host""
7578

7679
Write-Host"Command line arguments not listed above are passed thru to msbuild."
@@ -97,6 +100,7 @@ function Build {
97100

98101
$bl=if ($binaryLog) {'/bl:'+ (Join-Path$LogDir'Build.binlog') }else {'' }
99102
$platformArg=if ($platform) {"/p:Platform=$platform" }else {'' }
103+
$check=if ($buildCheck) {'/check' }else {'' }
100104

101105
if ($projects) {
102106
# Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
@@ -113,6 +117,7 @@ function Build {
113117
MSBuild$toolsetBuildProj`
114118
$bl`
115119
$platformArg`
120+
$check`
116121
/p:Configuration=$configuration`
117122
/p:RepoRoot=$RepoRoot`
118123
/p:Restore=$restore`
@@ -166,4 +171,4 @@ catch {
166171
ExitWithExitCode1
167172
}
168173

169-
ExitWithExitCode0
174+
ExitWithExitCode0

‎eng/common/build.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ usage()
4242
echo" --prepareMachine Prepare machine for CI run, clean up processes after build"
4343
echo" --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
4444
echo" --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
45+
echo" --buildCheck <value> Sets /check msbuild parameter"
4546
echo""
4647
echo"Command line arguments not listed above are passed thru to msbuild."
4748
echo"Arguments can also be passed in with a single hyphen."
@@ -76,6 +77,7 @@ clean=false
7677

7778
warn_as_error=true
7879
node_reuse=true
80+
build_check=false
7981
binary_log=false
8082
exclude_ci_binary_log=false
8183
pipelines_log=false
@@ -173,6 +175,9 @@ while [[ $# > 0 ]]; do
173175
node_reuse=$2
174176
shift
175177
;;
178+
-buildcheck)
179+
build_check=true
180+
;;
176181
-runtimesourcefeed)
177182
runtime_source_feed=$2
178183
shift
@@ -224,8 +229,14 @@ function Build {
224229
bl="/bl:\"$log_dir/Build.binlog\""
225230
fi
226231

232+
local check=""
233+
if [["$build_check"==true ]];then
234+
check="/check"
235+
fi
236+
227237
MSBuild$_InitializeToolset \
228238
$bl \
239+
$check \
229240
/p:Configuration=$configuration \
230241
/p:RepoRoot="$repo_root" \
231242
/p:Restore=$restore \
@@ -256,4 +267,4 @@ if [[ "$restore" == true ]]; then
256267
InitializeNativeTools
257268
fi
258269

259-
Build
270+
Build

‎eng/common/cibuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
1313
done
1414
scriptroot="$(cd -P"$( dirname"$source")"&&pwd)"
1515

16-
."$scriptroot/build.sh" --restore --build --test --pack --publish --ci$@
16+
."$scriptroot/build.sh" --restore --build --test --pack --publish --ci$@

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

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ parameters:
55
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
66
enableMicrobuildForMacAndLinux:false
77
# Location of the MicroBuild output folder
8-
microBuildOutputFolder:'$(Agent.TempDirectory)'
8+
microBuildOutputFolder:'$(Build.SourcesDirectory)'
99
continueOnError:false
1010

1111
steps:
@@ -41,7 +41,7 @@ steps:
4141
inputs:
4242
packageType:sdk
4343
version:8.0.x
44-
installationPath:${{ parameters.microBuildOutputFolder }}/dotnet
44+
installationPath:${{ parameters.microBuildOutputFolder }}/.dotnet
4545
workingDirectory:${{ parameters.microBuildOutputFolder }}
4646
condition:and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
4747

@@ -53,6 +53,7 @@ steps:
5353
feedSource:https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
5454
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
5555
azureSubscription:'MicroBuild Signing Task (DevDiv)'
56+
useEsrpCli:true
5657
env:
5758
TeamName:$(_TeamName)
5859
MicroBuildOutputFolderOverride:${{ parameters.microBuildOutputFolder }}
@@ -71,3 +72,28 @@ steps:
7172
eq(variables['_SignType'], 'real')
7273
)
7374
))
75+
76+
# Workaround for ESRP CLI on Linux - https://github.com/dotnet/source-build/issues/4964
77+
-${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
78+
-task:UseDotNet@2
79+
displayName:Install .NET 9.0 SDK for ESRP CLI Workaround
80+
inputs:
81+
packageType:sdk
82+
version:9.0.x
83+
installationPath:${{ parameters.microBuildOutputFolder }}/.dotnet
84+
workingDirectory:${{ parameters.microBuildOutputFolder }}
85+
condition:and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
86+
87+
-task:PowerShell@2
88+
displayName:Workaround for ESRP CLI on Linux
89+
inputs:
90+
targetType:'inline'
91+
script:|
92+
Write-Host "Copying Linux Path"
93+
$MBSIGN_APPFOLDER = '$(MBSIGN_APPFOLDER)'
94+
$MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER -replace '/build', ''
95+
$MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER + '/1.1.1032' + '/build'
96+
$MBSIGN_APPFOLDER | Write-Host
97+
$SignConfigPath = $MBSIGN_APPFOLDER + '/signconfig.xml'
98+
Copy-Item -Path "$(MBSIGN_APPFOLDER)/signconfig.xml" -Destination $SignConfigPath -Force
99+
condition:and(succeeded(), eq(variables['Agent.OS'], 'Linux'))

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"tools": {
3-
"dotnet":"10.0.100-preview.3.25125.5",
3+
"dotnet":"10.0.100-preview.3.25167.3",
44
"runtimes": {
55
"dotnet": [
66
"8.0.0"
77
]
88
}
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk":"10.0.0-beta.25164.6"
11+
"Microsoft.DotNet.Arcade.Sdk":"10.0.0-beta.25171.1"
1212
}
1313
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp