diff options
| author | Jarret Shook <jashoo@microsoft.com> | 2019-05-30 19:07:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-30 19:07:50 -0700 |
| commit | c6d6fc20a597b01ad0e2745b6933ca216746e7df (patch) | |
| tree | ccc5d02608cef241e0fe6ba7ea1036d1b9bcfc05 /eng/build-job.yml | |
| parent | 82bd51f001c8df3def3b327bb31fc7611539cbd8 (diff) | |
| download | coreclr-c6d6fc20a597b01ad0e2745b6933ca216746e7df.tar.gz coreclr-c6d6fc20a597b01ad0e2745b6933ca216746e7df.tar.bz2 coreclr-c6d6fc20a597b01ad0e2745b6933ca216746e7df.zip | |
Fix #24867 (#24870)
Pre SDK 3.0, a project type that is not .csproj would not include Directory.Build.targets. Change empty.proj to empty.csproj to allow source build, which uses a 2.1 sdk to build, correctly import Directory.Build.targets.
Diffstat (limited to 'eng/build-job.yml')
| -rw-r--r-- | eng/build-job.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eng/build-job.yml b/eng/build-job.yml index 9084ae9f7d..6170fcc59b 100644 --- a/eng/build-job.yml +++ b/eng/build-job.yml @@ -131,7 +131,7 @@ jobs: # Sign on Windows - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest'), eq(parameters.osGroup, 'Windows_NT')) }}: - - script: powershell eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 /p:ArcadeBuild=true /p:OfficialBuild=true /p:BuildOS=$(osGroup) /p:BuildArch=$(archType) /p:BuildType=$(buildConfigUpper) /p:DotNetSignType=%_SignType% -projects $(Build.SourcesDirectory)\eng\empty.proj + - script: powershell eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 /p:ArcadeBuild=true /p:OfficialBuild=true /p:BuildOS=$(osGroup) /p:BuildArch=$(archType) /p:BuildType=$(buildConfigUpper) /p:DotNetSignType=%_SignType% -projects $(Build.SourcesDirectory)\eng\empty.csproj displayName: Sign Binaries - task: PublishBuildArtifacts@1 @@ -168,7 +168,7 @@ jobs: # Publish official build - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - - script: ./eng/common/build.sh /p:DotNetPublishToBlobFeed=true --ci --restore --projects $(Build.SourcesDirectory)/eng/empty.proj + - script: ./eng/common/build.sh /p:DotNetPublishToBlobFeed=true --ci --restore --projects $(Build.SourcesDirectory)/eng/empty.csproj displayName: Restore blob feed tasks ${{ if eq(parameters.osGroup, 'FreeBSD') }}: env: @@ -184,7 +184,7 @@ jobs: DotNetCoreSdkDir: /usr/local/dotnet - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: # TODO: pass publish feed url and access token in from the internal pipeline - - powershell: eng\common\build.ps1 /p:DotNetPublishToBlobFeed=true -ci -restore -projects $(Build.SourcesDirectory)\eng\empty.proj + - powershell: eng\common\build.ps1 /p:DotNetPublishToBlobFeed=true -ci -restore -projects $(Build.SourcesDirectory)\eng\empty.csproj displayName: Restore blob feed tasks - powershell: eng\common\msbuild.ps1 -ci src\publishwitharcade.proj /p:__BuildType=$(buildConfigUpper) /p:__BuildArch=$(archType) /p:OSIdentifier=$(osIdentifier) /p:AzureFeedUrl=$(dotnetfeedUrl) /p:AzureAccountKey=$(dotnetfeedPAT) displayName: Publish packages to blob feed |