Skip to content

Commit a73b0fb

Browse files
rmarinhojonathanpeppers
rmarinho
and
jonathanpeppers
authored
[net10.0] Update preview4 dotnet (#29254)
* [ci] Update packages using dotnet/dotnet VMR * [ci] Update iOS and other versions * [ci] Update iOS and mac versions * Bump XCode * [iOS] Fix api for WKJavascriptEvaluationResult * [ci] Remove old mono manifest * [ci] update sdk/runtime * darc update-dependencies --channel ".NET 10.0.1xx SDK Preview 4" * darc update-dependencies --id 266521 --------- Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
1 parent 0ba1f9d commit a73b0fb

File tree

11 files changed

+195
-205
lines changed

11 files changed

+195
-205
lines changed

‎Directory.Build.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,16 @@
147147
<!-- version number information -->
148148
<PropertyGroup>
149149
<!-- Default versions from the SDKs (update when there is a new TFM version) -->
150-
<IosTargetFrameworkVersionSdkDefault>18.2</IosTargetFrameworkVersionSdkDefault>
151-
<TvosTargetFrameworkVersionSdkDefault>18.2</TvosTargetFrameworkVersionSdkDefault>
152-
<MacCatalystTargetFrameworkVersionSdkDefault>18.2</MacCatalystTargetFrameworkVersionSdkDefault>
153-
<MacosTargetFrameworkVersionSdkDefault>15.2</MacosTargetFrameworkVersionSdkDefault>
150+
<IosTargetFrameworkVersionSdkDefault>18.4</IosTargetFrameworkVersionSdkDefault>
151+
<TvosTargetFrameworkVersionSdkDefault>18.4</TvosTargetFrameworkVersionSdkDefault>
152+
<MacCatalystTargetFrameworkVersionSdkDefault>18.4</MacCatalystTargetFrameworkVersionSdkDefault>
153+
<MacosTargetFrameworkVersionSdkDefault>15.4</MacosTargetFrameworkVersionSdkDefault>
154154
<AndroidTargetFrameworkVersionSdkDefault>36.0</AndroidTargetFrameworkVersionSdkDefault>
155155
<!-- Current .NET -->
156-
<IosTargetFrameworkVersion>18.2</IosTargetFrameworkVersion>
157-
<TvosTargetFrameworkVersion>18.2</TvosTargetFrameworkVersion>
158-
<MacCatalystTargetFrameworkVersion>18.2</MacCatalystTargetFrameworkVersion>
159-
<MacosTargetFrameworkVersion>15.2</MacosTargetFrameworkVersion>
156+
<IosTargetFrameworkVersion>18.4</IosTargetFrameworkVersion>
157+
<TvosTargetFrameworkVersion>18.4</TvosTargetFrameworkVersion>
158+
<MacCatalystTargetFrameworkVersion>18.4</MacCatalystTargetFrameworkVersion>
159+
<MacosTargetFrameworkVersion>15.4</MacosTargetFrameworkVersion>
160160
<AndroidTargetFrameworkVersion>36.0</AndroidTargetFrameworkVersion>
161161
<WindowsTargetFrameworkVersion>10.0.19041.0</WindowsTargetFrameworkVersion>
162162
<Windows2TargetFrameworkVersion>10.0.20348.0</Windows2TargetFrameworkVersion>

‎eng/Version.Details.xml‎

Lines changed: 115 additions & 115 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -29,36 +29,36 @@
2929
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
3030
<MicrosoftMauiPreviousDotNetReleasedVersion>9.0.51</MicrosoftMauiPreviousDotNetReleasedVersion>
3131
<!-- dotnet/sdk -->
32-
<MicrosoftNETSdkPackageVersion>10.0.100-preview.4.25228.15</MicrosoftNETSdkPackageVersion>
32+
<MicrosoftNETSdkPackageVersion>10.0.100-preview.4.25230.109</MicrosoftNETSdkPackageVersion>
3333
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
3434
<!-- dotnet/runtime -->
35-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.4.25225.6</MicrosoftNETCoreAppRefPackageVersion>
35+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.4.25230.109</MicrosoftNETCoreAppRefPackageVersion>
3636
<SystemTextJsonPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextJsonPackageVersion>
3737
<SystemTextEncodingsWebPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextEncodingsWebPackageVersion>
3838
<MicrosoftBclAsyncInterfacesPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftBclAsyncInterfacesPackageVersion>
3939
<!-- Microsoft/Extensions -->
4040
<SystemCodeDomPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemCodeDomPackageVersion>
41-
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.4.25224.18</MicrosoftExtensionsConfigurationVersion>
42-
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.4.25224.18</MicrosoftExtensionsConfigurationAbstractionsVersion>
43-
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.4.25224.18</MicrosoftExtensionsConfigurationJsonVersion>
44-
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.4.25224.18</MicrosoftExtensionsDependencyInjectionVersion>
45-
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>10.0.0-preview.4.25224.18</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
46-
<MicrosoftExtensionsFileProvidersAbstractionsVersion>10.0.0-preview.4.25224.18</MicrosoftExtensionsFileProvidersAbstractionsVersion>
47-
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-preview.4.25224.18</MicrosoftExtensionsLoggingAbstractionsVersion>
48-
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.4.25224.18</MicrosoftExtensionsLoggingVersion>
49-
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-preview.4.25224.18</MicrosoftExtensionsLoggingConsoleVersion>
50-
<MicrosoftExtensionsLoggingDebugVersion>10.0.0-preview.4.25224.18</MicrosoftExtensionsLoggingDebugVersion>
51-
<MicrosoftExtensionsPrimitivesVersion>10.0.0-preview.4.25224.18</MicrosoftExtensionsPrimitivesVersion>
52-
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.0-preview.4.25224.18</MicrosoftExtensionsHostingAbstractionsVersion>
41+
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.4.25230.109</MicrosoftExtensionsConfigurationVersion>
42+
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.4.25230.109</MicrosoftExtensionsConfigurationAbstractionsVersion>
43+
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.4.25230.109</MicrosoftExtensionsConfigurationJsonVersion>
44+
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.4.25230.109</MicrosoftExtensionsDependencyInjectionVersion>
45+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>10.0.0-preview.4.25230.109</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
46+
<MicrosoftExtensionsFileProvidersAbstractionsVersion>10.0.0-preview.4.25230.109</MicrosoftExtensionsFileProvidersAbstractionsVersion>
47+
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-preview.4.25230.109</MicrosoftExtensionsLoggingAbstractionsVersion>
48+
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.4.25230.109</MicrosoftExtensionsLoggingVersion>
49+
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-preview.4.25230.109</MicrosoftExtensionsLoggingConsoleVersion>
50+
<MicrosoftExtensionsLoggingDebugVersion>10.0.0-preview.4.25230.109</MicrosoftExtensionsLoggingDebugVersion>
51+
<MicrosoftExtensionsPrimitivesVersion>10.0.0-preview.4.25230.109</MicrosoftExtensionsPrimitivesVersion>
52+
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.0-preview.4.25230.109</MicrosoftExtensionsHostingAbstractionsVersion>
5353
<!-- xamarin/xamarin-android -->
54-
<MicrosoftAndroidSdkWindowsPackageVersion>36.0.0-ci.main.69</MicrosoftAndroidSdkWindowsPackageVersion>
54+
<MicrosoftAndroidSdkWindowsPackageVersion>36.0.0-preview.4.77</MicrosoftAndroidSdkWindowsPackageVersion>
5555
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.61</MicrosoftNETSdkAndroidManifest90100PackageVersion>
5656
<AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest90100PackageVersion)</AndroidNetPreviousVersion>
5757
<!-- xamarin/xamarin-macios -->
58-
<MicrosoftMacCatalystSdknet100_182PackageVersion>18.2.10691-net10-p4</MicrosoftMacCatalystSdknet100_182PackageVersion>
59-
<MicrosoftmacOSSdknet100_152PackageVersion>15.2.10691-net10-p4</MicrosoftmacOSSdknet100_152PackageVersion>
60-
<MicrosoftiOSSdknet100_182PackageVersion>18.2.10691-net10-p4</MicrosoftiOSSdknet100_182PackageVersion>
61-
<MicrosofttvOSSdknet100_182PackageVersion>18.2.10691-net10-p4</MicrosofttvOSSdknet100_182PackageVersion>
58+
<MicrosoftMacCatalystSdknet100_184PackageVersion>18.4.10467-net10-p4</MicrosoftMacCatalystSdknet100_184PackageVersion>
59+
<MicrosoftmacOSSdknet100_154PackageVersion>15.4.10467-net10-p4</MicrosoftmacOSSdknet100_154PackageVersion>
60+
<MicrosoftiOSSdknet100_184PackageVersion>18.4.10467-net10-p4</MicrosoftiOSSdknet100_184PackageVersion>
61+
<MicrosofttvOSSdknet100_184PackageVersion>18.4.10467-net10-p4</MicrosofttvOSSdknet100_184PackageVersion>
6262
<!-- Samsung/Tizen.NET -->
6363
<SamsungTizenSdkPackageVersion>8.0.148</SamsungTizenSdkPackageVersion>
6464
<!-- wasdk -->
@@ -67,19 +67,19 @@
6767
<MicrosoftGraphicsWin2DPackageVersion>1.2.0</MicrosoftGraphicsWin2DPackageVersion>
6868
<MicrosoftWindowsWebView2PackageVersion>1.0.2903.40</MicrosoftWindowsWebView2PackageVersion>
6969
<!-- Everything else -->
70-
<MicrosoftAspNetCoreAuthorizationPackageVersion>10.0.0-preview.4.25225.1</MicrosoftAspNetCoreAuthorizationPackageVersion>
71-
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>10.0.0-preview.4.25225.1</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
72-
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>10.0.0-preview.4.25225.1</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
73-
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>10.0.0-preview.4.25225.1</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
74-
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>10.0.0-preview.4.25225.1</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
75-
<MicrosoftAspNetCoreComponentsFormsPackageVersion>10.0.0-preview.4.25225.1</MicrosoftAspNetCoreComponentsFormsPackageVersion>
76-
<MicrosoftAspNetCoreComponentsPackageVersion>10.0.0-preview.4.25225.1</MicrosoftAspNetCoreComponentsPackageVersion>
77-
<MicrosoftAspNetCoreComponentsWebPackageVersion>10.0.0-preview.4.25225.1</MicrosoftAspNetCoreComponentsWebPackageVersion>
78-
<MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>10.0.0-preview.4.25225.1</MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>
79-
<MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>10.0.0-preview.4.25225.1</MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>
80-
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>10.0.0-preview.4.25225.1</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
81-
<MicrosoftAspNetCoreMetadataPackageVersion>10.0.0-preview.4.25225.1</MicrosoftAspNetCoreMetadataPackageVersion>
82-
<MicrosoftJSInteropPackageVersion>10.0.0-preview.4.25225.1</MicrosoftJSInteropPackageVersion>
70+
<MicrosoftAspNetCoreAuthorizationPackageVersion>10.0.0-preview.4.25230.109</MicrosoftAspNetCoreAuthorizationPackageVersion>
71+
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>10.0.0-preview.4.25230.109</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
72+
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>10.0.0-preview.4.25230.109</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
73+
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>10.0.0-preview.4.25230.109</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
74+
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>10.0.0-preview.4.25230.109</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
75+
<MicrosoftAspNetCoreComponentsFormsPackageVersion>10.0.0-preview.4.25230.109</MicrosoftAspNetCoreComponentsFormsPackageVersion>
76+
<MicrosoftAspNetCoreComponentsPackageVersion>10.0.0-preview.4.25230.109</MicrosoftAspNetCoreComponentsPackageVersion>
77+
<MicrosoftAspNetCoreComponentsWebPackageVersion>10.0.0-preview.4.25230.109</MicrosoftAspNetCoreComponentsWebPackageVersion>
78+
<MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>10.0.0-preview.4.25230.109</MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>
79+
<MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>10.0.0-preview.4.25230.109</MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>
80+
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>10.0.0-preview.4.25230.109</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
81+
<MicrosoftAspNetCoreMetadataPackageVersion>10.0.0-preview.4.25230.109</MicrosoftAspNetCoreMetadataPackageVersion>
82+
<MicrosoftJSInteropPackageVersion>10.0.0-preview.4.25230.109</MicrosoftJSInteropPackageVersion>
8383
<!-- Everything else (previous edition) -->
8484
<MicrosoftAspNetCorePackageVersion>8.0.10</MicrosoftAspNetCorePackageVersion>
8585
<MicrosoftAspNetCoreAuthorizationPreviousPackageVersion>$(MicrosoftAspNetCorePackageVersion)</MicrosoftAspNetCoreAuthorizationPreviousPackageVersion>
@@ -135,13 +135,13 @@
135135
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
136136
<ExCSSPackageVersion>4.2.3</ExCSSPackageVersion>
137137
<SystemDrawingCommonPackageVersion>9.0.0</SystemDrawingCommonPackageVersion>
138-
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25212.1</MicrosoftDotNetBuildTasksFeedVersion>
139-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25212.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
140-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25212.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
141-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25212.1</MicrosoftDotNetHelixSdkPackageVersion>
138+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25230.109</MicrosoftDotNetBuildTasksFeedVersion>
139+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25230.109</MicrosoftDotNetBuildTasksInstallersPackageVersion>
140+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25230.109</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
141+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25230.109</MicrosoftDotNetHelixSdkPackageVersion>
142142
<MicroBuildPluginsSwixBuildDotnetPackageVersion>1.1.87-gba258badda</MicroBuildPluginsSwixBuildDotnetPackageVersion>
143-
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25212.1</MicrosoftDotNetRemoteExecutorPackageVersion>
144-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25212.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
143+
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25230.109</MicrosoftDotNetRemoteExecutorPackageVersion>
144+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25230.109</MicrosoftDotNetXUnitExtensionsPackageVersion>
145145
</PropertyGroup>
146146
<PropertyGroup>
147147
<MicrosoftNETTestSdkPackageVersion>17.6.0</MicrosoftNETTestSdkPackageVersion>
@@ -203,9 +203,9 @@
203203
<DotNetAndroidManifestVersionBand>$(DotNetVersionBand)</DotNetAndroidManifestVersionBand>
204204
<DotNetMaciOSManifestVersionBand>$(DotNetVersionBand)</DotNetMaciOSManifestVersionBand>
205205
<DotNetTizenManifestVersionBand>9.0.100</DotNetTizenManifestVersionBand>
206-
<MicrosoftMacCatalystSdkPackageVersion>$(MicrosoftMacCatalystSdknet100_182PackageVersion)</MicrosoftMacCatalystSdkPackageVersion>
207-
<MicrosoftmacOSSdkPackageVersion>$(MicrosoftmacOSSdknet100_152PackageVersion)</MicrosoftmacOSSdkPackageVersion>
208-
<MicrosoftiOSSdkPackageVersion>$(MicrosoftiOSSdknet100_182PackageVersion)</MicrosoftiOSSdkPackageVersion>
209-
<MicrosofttvOSSdkPackageVersion>$(MicrosofttvOSSdknet100_182PackageVersion)</MicrosofttvOSSdkPackageVersion>
206+
<MicrosoftMacCatalystSdkPackageVersion>$(MicrosoftMacCatalystSdknet100_184PackageVersion)</MicrosoftMacCatalystSdkPackageVersion>
207+
<MicrosoftmacOSSdkPackageVersion>$(MicrosoftmacOSSdknet100_154PackageVersion)</MicrosoftmacOSSdkPackageVersion>
208+
<MicrosoftiOSSdkPackageVersion>$(MicrosoftiOSSdknet100_184PackageVersion)</MicrosoftiOSSdkPackageVersion>
209+
<MicrosofttvOSSdkPackageVersion>$(MicrosofttvOSSdknet100_184PackageVersion)</MicrosofttvOSSdkPackageVersion>
210210
</PropertyGroup>
211211
</Project>

‎eng/common/core-templates/jobs/jobs.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ parameters:
2727
# Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage.
2828
publishAssetsImmediately: false
2929

30+
# Optional: 🌤️ or not the build has assets it wants to publish to BAR
31+
isAssetlessBuild: false
32+
3033
# Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml)
3134
artifactsPublishingAdditionalParameters: ''
3235
signingValidationAdditionalParameters: ''
@@ -110,6 +113,7 @@ jobs:
110113

111114
runAsPublic: ${{ parameters.runAsPublic }}
112115
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
116+
isAssetlessBuild: ${{ parameters.isAssetlessBuild }}
113117
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
114118
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
115119
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,6 @@ parameters:
1111
steps:
1212
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
1313
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
14-
# Install Python 3.12.x on when Python > 3.12.x is installed - https://github.com/dotnet/source-build/issues/4802
15-
- script: |
16-
version=$(python3 --version | awk '{print $2}')
17-
major=$(echo $version | cut -d. -f1)
18-
minor=$(echo $version | cut -d. -f2)
19-
20-
installPython=false
21-
if [ "$major" -gt 3 ] || { [ "$major" -eq 3 ] && [ "$minor" -gt 12 ]; }; then
22-
installPython=true
23-
fi
24-
25-
echo "Python version: $version."
26-
echo "Install Python 3.12.x: $installPython."
27-
echo "##vso[task.setvariable variable=installPython;isOutput=true]$installPython"
28-
name: InstallPython
29-
displayName: 'Determine Python installation'
30-
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
31-
32-
- task: UsePythonVersion@0
33-
inputs:
34-
versionSpec: '3.12.x'
35-
displayName: 'Use Python 3.12.x'
36-
condition: and(succeeded(), eq(variables['InstallPython.installPython'], 'true'), ne(variables['Agent.Os'], 'Windows_NT'))
37-
3814
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
3915
- task: UseDotNet@2
4016
displayName: Install .NET 8.0 SDK for MicroBuild Plugin

‎eng/common/cross/tizen-fetch.sh‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,8 @@ fetch_tizen_pkgs()
156156
done
157157
}
158158

159-
if [ "$TIZEN_ARCH" == "riscv64" ]; then
160-
BASE="Tizen-Base-RISCV"
161-
UNIFIED="Tizen-Unified-RISCV"
162-
else
163-
BASE="Tizen-Base"
164-
UNIFIED="Tizen-Unified"
165-
fi
159+
BASE="Tizen-Base"
160+
UNIFIED="Tizen-Unified"
166161

167162
Inform "Initialize ${TIZEN_ARCH} base"
168163
fetch_tizen_pkgs_init standard $BASE

‎eng/common/sdk-task.ps1‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ Param(
66
[string] $msbuildEngine = $null,
77
[switch] $restore,
88
[switch] $prepareMachine,
9+
[switch][Alias('nobl')]$excludeCIBinaryLog,
910
[switch] $help,
1011
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
1112
)
1213

1314
$ci = $true
14-
$binaryLog = $true
15+
$binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
1516
$warnAsError = $true
1617

1718
. $PSScriptRoot\tools.ps1
@@ -27,17 +28,19 @@ function Print-Usage() {
2728
Write-Host "Advanced settings:"
2829
Write-Host " -prepareMachine Prepare machine for CI run"
2930
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
31+
Write-Host " -excludeCIBinaryLog When running on CI, allow no binary log (short: -nobl)"
3032
Write-Host ""
3133
Write-Host "Command line arguments not listed above are passed thru to msbuild."
3234
}
3335

3436
function Build([string]$target) {
3537
$logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" }
3638
$log = Join-Path $LogDir "$task$logSuffix.binlog"
39+
$binaryLogArg = if ($binaryLog) { "/bl:$log" } else { "" }
3740
$outputPath = Join-Path $ToolsetDir "$task\"
3841

3942
MSBuild $taskProject `
40-
/bl:$log `
43+
$binaryLogArg `
4144
/t:$target `
4245
/p:Configuration=$configuration `
4346
/p:RepoRoot=$RepoRoot `

‎eng/common/sdk-task.sh‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ show_usage() {
77
echo " --verbosity <value> Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
88
echo " --help Print help and exit"
99
echo ""
10+
11+
echo "Advanced settings:"
12+
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
13+
echo ""
1014
echo "Command line arguments not listed above are passed thru to msbuild."
1115
}
1216

@@ -27,10 +31,12 @@ Build() {
2731
local log_suffix=""
2832
[[ "$target" != "Execute" ]] && log_suffix=".$target"
2933
local log="$log_dir/$task$log_suffix.binlog"
34+
local binaryLogArg=""
35+
[[ $binary_log == true ]] && binaryLogArg="/bl:$log"
3036
local output_path="$toolset_dir/$task/"
3137

3238
MSBuild "$taskProject" \
33-
/bl:"$log" \
39+
$binaryLogArg \
3440
/t:"$target" \
3541
/p:Configuration="$configuration" \
3642
/p:RepoRoot="$repo_root" \
@@ -39,8 +45,10 @@ Build() {
3945
$properties
4046
}
4147

48+
binary_log=true
4249
configuration="Debug"
4350
verbosity="minimal"
51+
exclude_ci_binary_log=false
4452
restore=false
4553
help=false
4654
properties=''
@@ -60,6 +68,11 @@ while (($# > 0)); do
6068
verbosity=$2
6169
shift 2
6270
;;
71+
--excludecibinarylog|--nobl)
72+
binary_log=false
73+
exclude_ci_binary_log=true
74+
shift 1
75+
;;
6376
--help)
6477
help=true
6578
shift 1
@@ -72,7 +85,6 @@ while (($# > 0)); do
7285
done
7386

7487
ci=true
75-
binaryLog=true
7688
warnAsError=true
7789

7890
if $help; then

0 commit comments

Comments
 (0)