Skip to content

Commit b7f5416

Browse files
[main] Source code updates from dotnet/dotnet (#10808)
* Update dependencies from https://github.com/dotnet/dotnet * Remove obsolete apicompat entry * Remove CoherentParentDependency & SourceBuildTarball metadata * Add BuildWithNetFrameworkHostedCompiler * Revert SDK upgrade --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent 7981e6b commit b7f5416

17 files changed

+115
-110
lines changed

eng/Version.Details.xml

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

eng/Versions.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@
1919
dotnet/winforms is handling versions for the analyzers.
2020
-->
2121
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
22+
<MicrosoftPrivateWinformsVersion>10.0.0-preview.4.25223.119</MicrosoftPrivateWinformsVersion>
23+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.4.25223.119</MicrosoftDotnetWinFormsProjectTemplatesVersion>
24+
<SystemDrawingCommonVersion>10.0.0-preview.4.25223.119</SystemDrawingCommonVersion>
25+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25223.119</MicrosoftDotNetCodeAnalysisVersion>
26+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25223.119</MicrosoftDotNetGenAPIVersion>
27+
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25223.119</MicrosoftSourceLinkAzureReposGitVersion>
28+
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25223.119</MicrosoftSourceLinkGitHubVersion>
2229
</PropertyGroup>
2330
<!-- Packages that come from https://github.com/dotnet/winforms -->
2431
<PropertyGroup>

eng/common/SetupNugetSources.sh

100644100755
File mode changed.

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: 12 additions & 26 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
@@ -91,8 +67,18 @@ steps:
9167
script: |
9268
Write-Host "Copying Linux Path"
9369
$MBSIGN_APPFOLDER = '$(MBSIGN_APPFOLDER)'
94-
$MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER -replace '/build', ''
95-
$MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER + '/1.1.1032' + '/build'
70+
$MBSIGN_APPFOLDER = ($MBSIGN_APPFOLDER -replace '/build', '')
71+
72+
$versionRegex = '\d+\.\d+\.\d+'
73+
$package = Get-ChildItem -Path $MBSIGN_APPFOLDER -Directory |
74+
Where-Object { $_.Name -match $versionRegex }
75+
76+
if ($package.Count -ne 1) {
77+
Write-Host "There should be exactly one matching subfolder, but found $($package.Count)."
78+
exit 1
79+
}
80+
81+
$MBSIGN_APPFOLDER = $package[0].FullName + '/build'
9682
$MBSIGN_APPFOLDER | Write-Host
9783
$SignConfigPath = $MBSIGN_APPFOLDER + '/signconfig.xml'
9884
Copy-Item -Path "$(MBSIGN_APPFOLDER)/signconfig.xml" -Destination $SignConfigPath -Force

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ steps:
9393
$portableBuildArgs \
9494
/p:DotNetBuildSourceOnly=true \
9595
/p:DotNetBuildRepo=true \
96-
/p:AssetManifestFileName=$assetManifestFileName
96+
/p:AssetManifestFileName=$assetManifestFileName \
97+
/p:SetUpSourceBuildIntermediateNupkgCache=false \
98+
/p:ReportPrebuiltUsage=false
9799
displayName: Build
98100

99101
# Upload build logs for diagnosis.

eng/common/cross/arm64/tizen/tizen.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
55
Use the shared library, but some functions are only in
66
the static library, so try that secondarily. */
77
OUTPUT_FORMAT(elf64-littleaarch64)
8-
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-aarch64.so.1 ) )
8+
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-aarch64.so.1 ) )
99
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-aarch64.so.1 ) )

eng/common/cross/install-debs.py

100644100755
File mode changed.

eng/common/cross/tizen-build-rootfs.sh

100644100755
File mode changed.

eng/common/cross/tizen-fetch.sh

100644100755
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

0 commit comments

Comments
 (0)