Merge release/2.1 infrastructure changes into master #646
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Stabilize CLI. * Use stable MSBuild. * Fix MSBuild version to match prodcon build. * Modify CLI build file to always ignore NU5104
* Add web to smoke-test, with and without dev certs * Only reset caches when a test will run Avoid conflicting with a hanging process if there's no need to delete the files anyway.
Update OfficialBuildId from BuildId in the manifest. Update ProdCon feed to latest in manifest. * Update BuildTools to 2.1.0-rc1-02911-02 This brings in the new updaters without any other changes. (cherry picked from commit 6ec0829)
…port (dotnet#598) * Update shas to latest from ProdCon build 20180513-01-1739532 * Another update from ProdCon 20180605-09-17649701. * Add temporary targeting pack patches for MSBuild and NuGet. * Revert unneeded change to MSBuild and NuGet. * Fix patches.
RoslynTools-using repos look for PB_IsStable.
[release/2.1] 2.1.1 fixes, combined
Related work items: #633677
Add script to fetch internal vsts commits
Call internal fetch conditionally in build definition
…uild and smoke-test for internal builds
Update to the 2018-06-18 ProdCon 2.1.2 build. Manually updated the AspNetCore package version used and ProdConFeed.txt.
Add archiving of packages restored during smoke-test and include them in the tarball so they can be used by the tarball smoke-test.
…nBlobFeedReplaceOld/New This allows auto-update from a file while changing the ProdCon feed URL to a long-term location anyone can use to build.
Merge v2.1.2-ga into release/2.1
Add fetch-vsts-commits.ps1 because the DotNet-Orchestration-Utils repo expects Windows. Move vsts-build-templates into .vsts.pipelines/steps which seems to be more conventional.
[release/2.1] Add "vsts_prodcon_update" build to perform VSTS ProdCon updates
dagood
commented
Jul 13, 2018
| @@ -17,6 +17,7 @@ | |||
|
|
|||
| <ItemGroup> | |||
| <EnvironmentVariables Include="MS_PFX_PATH=$(NuGetKeyFilePath)" /> | |||
| <EnvironmentVariables Include="NUGET_PFX_PATH=$(NuGetKeyFilePath)" /> | |||
There was a problem hiding this comment.
Yeah, there's now two different variables used for the PFX path, we will attempt to delay-sign and fail without this. I can look at whether we can disable signing entirely, that seems like the better option.
| @@ -53,6 +53,7 @@ | |||
| <EnvironmentVariables Include="DotNetCoreSdkDir=$(DotNetCliToolDir)" /> | |||
| <EnvironmentVariables Include="DotNetBuildToolsDir=$(ProjectDir)Tools/" /> | |||
| <EnvironmentVariables Include="StabilizePackageVersion=$(UseStableVersions)" Condition="'$(UseStableVersions)' != ''" /> | |||
| <EnvironmentVariables Include="PB_IsStable=$(UseStableVersions)" Condition="'$(UseStableVersions)' != ''" /> | |||
There was a problem hiding this comment.
This is from cdf7249, we do need it for proper versions.
dseefeld
reviewed
Jul 13, 2018
netci.groovy
Outdated
| @@ -44,7 +44,7 @@ def addBuildStepsAndSetMachineAffinity(def job, String os, String configuration) | |||
| shell("git submodule update --init --recursive"); | |||
| shell("./build.sh /p:Configuration=${configuration} ${loggingOptions}"); | |||
| smokeTestExcludes = ""; | |||
| if (os == "OSX10.12") { | |||
| if (os == "Fedora24" || os == "OSX10.12") { | |||
There was a problem hiding this comment.
We probably don't need this change in master. Master is updated to build on Fedora28, now.
dseefeld
approved these changes
Jul 13, 2018
# Conflicts: # BuildToolsVersion.txt # dependencies.props # dependencies.targets # netci.groovy # repos/cli.proj # repos/msbuild.proj # smoke-test.sh # src/cli # src/core-setup # src/coreclr # src/corefx
crummel
approved these changes
Jul 13, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The 2.1.2 release saw some changes in
release/2.1infra to support VSTS builds. This merge takes those changes intomasterfor the future. I made some edits to the merge commit to fix conflicts and remove any submodule upgrades related to the 2.1.2 release.Don't squash this PR. Squashing #577 (an earlier 2.1 => master merge) made some commits it included to show up in this PR's commit list, too.