Skip to content

Commit 127cf9e

Browse files
committed
[build] Don't rebuild managed code on packaging time on Windows
Rebuilding the managed code on Windows causes it to want to use `msvcrt` instead of `c` when resolving `libc` p/invokes, which will cause the libc calls to fail on Unix. Download and extract the `Managed` artifact on packaging time, so that the assemblies built on Unix are properly packaged and not rebuilt.
1 parent e1269a5 commit 127cf9e

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

ci/azure-pipelines.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,12 @@ stages:
370370
artifactName: 'tvOS'
371371
downloadPath: $(Build.ArtifactStagingDirectory)
372372

373+
- task: DownloadBuildArtifacts@0
374+
displayName: Download managed build artifacts
375+
inputs:
376+
artifactName: 'Managed'
377+
downloadPath: $(Build.ArtifactStagingDirectory)
378+
373379
- template: /ci/templates/extract-artifact.yaml
374380
parameters:
375381
displayName: Extract Linux host X86-64 build
@@ -503,6 +509,13 @@ stages:
503509
archiveName: '$(MacTVOSSimX64ArchiveName)'
504510
destinationFolder: '$(MacTVOSSimX64BuildDir)'
505511

512+
- template: templates/extract-artifact.yaml
513+
parameters:
514+
displayName: Extract Managed build
515+
artifactName: 'Managed'
516+
archiveName: '$(ManagedArchiveName)'
517+
destinationFolder: '$(ManagedBuildDir)'
518+
506519
- powershell: |
507520
& eng\common\Build.ps1 -restore -build -sign -pack -publish -ci -configuration $(_BuildConfig) -projects $(Build.SourcesDirectory)\Mono.Unix.sln /p:PackageAllNativeLibs=true $(_InternalBuildArgs)
508521
displayName: Build

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<VersionPrefix>7.0.0</VersionPrefix>
5-
<PreReleaseVersionLabel>final</PreReleaseVersionLabel>
6-
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
4+
<VersionPrefix>7.0.1</VersionPrefix>
5+
<!-- <PreReleaseVersionLabel>final</PreReleaseVersionLabel>
6+
<PreReleaseVersionIteration>1</PreReleaseVersionIteration> -->
77
</PropertyGroup>
88
</Project>

0 commit comments

Comments
 (0)