Skip to content

Add additional ProdCon updaters pointed at recent 2.1.1 build #602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 11, 2018

Conversation

dagood
Copy link
Member

@dagood dagood commented Jun 8, 2018

Upgrades buildtools to get new updaters implemented in dotnet/buildtools#2047 and configures them, pointing at the recent 2.1.1 build.

I'm planning on porting the buildtools change from master to 2.1 once this gets merged, then porting this PR to source-build 2.1.

Ideally I'd use a master manifest rather than 2.1.1, but we don't have one. The source-build master appears to still be on 2.1.0 for now so this is still an upgrade.

#534

dagood added 2 commits June 8, 2018 14:33
Update OfficialBuildId from BuildId in the manifest.

Update ProdCon feed to latest in manifest.

Auto-update buildtools from master.
@dagood dagood requested review from dseefeld, crummel and eerhardt June 8, 2018 19:39
@@ -371,6 +371,7 @@

<Target Name="GetProjectDirectory" Outputs="$(ProjectDirectory)" />
<Target Name="GetOrchestratedManifestBuildName" Outputs="$(OrchestratedManifestBuildName)" />
<Target Name="GetOfficialBuildId" Outputs="OfficialBuildId" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be $(OfficialBuildId) ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, yep. As-is this ends up creating a build id updater for every project unconditionally.

dagood added 2 commits June 11, 2018 12:37
2.1.1 CoreFX can't build with the master (2.2.0) BuildTools version.
@dagood
Copy link
Member Author

dagood commented Jun 11, 2018

In this PR I updated buildtools to master to get the new updaters, but this is incompatible with the 2.1.1 CoreFX commit. I reverted the BuildTools update to see if the submodule updates go through CI other than that.

Once dotnet/buildtools#2063 is through, we'll have a 2.1 BuildTools that includes the updaters.

We're also at an awkward place where #589 will update the Core repos to master soon. There aren't any ProdCon master builds to point at, so it will become impossible to meaningfully test auto-update config changes in source-build master.

@dagood
Copy link
Member Author

dagood commented Jun 11, 2018

@crummel, looks like I also ran into the reason we need net46 builds. (#592)

/mnt/j/workspace/dotnet_source-build/master/Ubuntu16.04_Release_prtest/src/sdk/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj :
error NU1202: Package Microsoft.Build.Framework 15.7.179 is not compatible with net46 (.NETFramework,Version=v4.6).
Package Microsoft.Build.Framework 15.7.179 supports: netstandard2.0 (.NETStandard,Version=v2.0) 
[/mnt/j/workspace/dotnet_source-build/master/Ubuntu16.04_Release_prtest/src/sdk/sdk.sln] [/mnt/j/workspace/dotnet_source-build/master/Ubuntu16.04_Release_prtest/repos/sdk.proj]

I'll revert the upgrade entirely for now, and just get the configuration in.

Edit: The port of the new updaters to BuildTools 2.1 is done. I updated to that version so the auto-update configuration won't immediately fail because of the updater types not existing.

dagood added 2 commits June 11, 2018 13:57
This brings in the new updaters without any other changes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants