diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index 2b80c13bf04..fe46fcdcd91 100644 --- a/.vsts-dotnet-ci.yml +++ b/.vsts-dotnet-ci.yml @@ -248,3 +248,9 @@ jobs: ArtifactName: 'MonoOnMac test logs' continueOnError: true condition: always() + +- template: /eng/common/templates/job/source-build.yml + parameters: + platform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml index dae4ff8d4aa..bd006c55f5d 100644 --- a/.vsts-dotnet.yml +++ b/.vsts-dotnet.yml @@ -237,12 +237,19 @@ stages: displayName: Execute cleanup tasks condition: succeededOrFailed() + - template: /eng/common/templates/job/source-build.yml + parameters: + platform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + - template: /eng/common/templates/job/publish-build-assets.yml parameters: enablePublishBuildArtifacts: true publishUsingPipelines: true dependsOn: - Windows_NT + - Source_Build_Managed pool: vmImage: vs2017-win2016 diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets index e699c81e7dc..0bc6b1db9cd 100644 --- a/eng/AfterSigning.targets +++ b/eng/AfterSigning.targets @@ -1,5 +1,5 @@ - + - + diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props new file mode 100644 index 00000000000..7218b37ccf0 --- /dev/null +++ b/eng/SourceBuild.props @@ -0,0 +1,13 @@ + + + + msbuild + + + + + $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\MSBuild.SourceBuild.slnf" + + + + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml new file mode 100644 index 00000000000..c1b6dfbf053 --- /dev/null +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a5f0ed8f09..6f7ab023c5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,6 +4,7 @@ https://github.com/dotnet/arcade c7d6bd607715f334cda90e01967bb0c02dee09be + https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 768180429cc..8fb1af53f90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,6 +23,7 @@ + 4.6.0 diff --git a/src/MSBuild/MSBuild.csproj b/src/MSBuild/MSBuild.csproj index 912ca4f12ef..34b768cd9c1 100644 --- a/src/MSBuild/MSBuild.csproj +++ b/src/MSBuild/MSBuild.csproj @@ -14,7 +14,7 @@ - win7-x86;win7-x64 + win7-x86;win7-x64 false true diff --git a/src/MSBuildTaskHost/MSBuildTaskHost.csproj b/src/MSBuildTaskHost/MSBuildTaskHost.csproj index 37d0b1c70d6..7890d4c0e92 100644 --- a/src/MSBuildTaskHost/MSBuildTaskHost.csproj +++ b/src/MSBuildTaskHost/MSBuildTaskHost.csproj @@ -13,7 +13,7 @@ - win7-x86;win7-x64 + win7-x86;win7-x64 false $(DefineConstants);CLR2COMPATIBILITY;TASKHOST