-
Notifications
You must be signed in to change notification settings - Fork 137
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
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e8300d8
Add new ProdCon manifest updaters from 2.1.1
dagood c6cd027
Update ProdCon to 20180605-09-1755081
dagood b4cd435
Return $(OfficialBuildId), not OfficialBuildId
dagood 2056911
Revert BuildTools upgrade to master
dagood 0c49423
Revert "Update ProdCon to 20180605-09-1755081"
dagood d6d3bbb
Update BuildTools to 2.1.0-rc1-02911-02
dagood File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 2.1.0-rc1-02804-05 | ||
| 2.2.0-preview1-02824-02 |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180515-07/final/index.json | ||
| https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180605-09/final/index.json |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,90 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Target Name="CreateOrchestratedBuildSubmoduleUpdaters" | ||
|
|
||
| <UsingTask AssemblyFile="$(TasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.dll" TaskName="JoinItems" /> | ||
|
|
||
| <Target Name="CreateOrchestratedBuildUpdaters" | ||
| BeforeTargets="CreateDefaultDependencyInfos" | ||
| Condition="'$(SkipOrchestratedBuildSubmoduleUpdate)' != 'true'"> | ||
| Condition="'$(SkipOrchestratedBuildUpdate)' != 'true'"> | ||
|
|
||
| <ItemGroup> | ||
| <OrchestratedBuildRepoProjects Include="$(ProjectDir)repos\*.proj" /> | ||
| <RepoProjectFile Include="$(ProjectDir)repos\*.proj" /> | ||
| </ItemGroup> | ||
|
|
||
| <MSBuild Projects="@(OrchestratedBuildRepoProjects)" | ||
| Targets="GetOrchestratedManifestBuildName"> | ||
| <!-- | ||
| Evaluate the dependency properties of each repo project. Use MSBuildSourceProjectFile as the | ||
| join key to make one combined item for each project with all available metadata. | ||
| --> | ||
| <MSBuild Projects="@(RepoProjectFile)" Targets="GetOrchestratedManifestBuildName"> | ||
| <Output TaskParameter="TargetOutputs" ItemName="OrchestratedManifestBuildNames" /> | ||
| </MSBuild> | ||
| <ItemGroup> | ||
| <_RepoProjectExtractedProperties | ||
| Include="@(OrchestratedManifestBuildNames)" | ||
| BuildName="%(Identity)" | ||
| KeepMetadata="MSBuildSourceProjectFile" /> | ||
| </ItemGroup> | ||
|
|
||
| <MSBuild Projects="@(OrchestratedBuildRepoProjects)" | ||
| Targets="GetProjectDirectory"> | ||
| <MSBuild Projects="@(RepoProjectFile)" Targets="GetProjectDirectory"> | ||
| <Output TaskParameter="TargetOutputs" ItemName="ProjectDirectories" /> | ||
| </MSBuild> | ||
| <ItemGroup> | ||
| <_RepoProjectExtractedProperties | ||
| Include="@(ProjectDirectories)" | ||
| ProjectDirectory="%(Identity)" | ||
| KeepMetadata="MSBuildSourceProjectFile" /> | ||
| </ItemGroup> | ||
|
|
||
| <MSBuild Projects="@(RepoProjectFile)" Targets="GetOfficialBuildId"> | ||
| <Output TaskParameter="TargetOutputs" ItemName="OfficialBuildIds" /> | ||
| </MSBuild> | ||
| <ItemGroup> | ||
| <_RepoProjectExtractedProperties | ||
| Include="@(OfficialBuildIds)" | ||
| OfficialBuildId="%(Identity)" | ||
| KeepMetadata="MSBuildSourceProjectFile" /> | ||
| </ItemGroup> | ||
|
|
||
| <JoinItems | ||
| Left="@(RepoProjectFile)" LeftMetadata="*" | ||
| Right="@(_RepoProjectExtractedProperties)" RightKey="MSBuildSourceProjectFile" RightMetadata="*"> | ||
| <Output TaskParameter="JoinResult" ItemName="_JoinProjectFileProperties" /> | ||
| </JoinItems> | ||
|
|
||
| <!-- Add the git submodule directory to each project item. --> | ||
| <ReadGitConfigFile File="$(GitModulesPath)"> | ||
| <Output TaskParameter="SubmoduleConfiguration" ItemName="SubmoduleConfigurations" /> | ||
| </ReadGitConfigFile> | ||
|
|
||
| <!-- | ||
| Perform joins to gather information about each repo into a single item each. Each A-B join | ||
| first creates all A*B "candidate" combinations. The candidate items are then filtered down to | ||
| the combinations where the desired metadata from A and B match. | ||
| --> | ||
| <ItemGroup> | ||
| <!-- Join manifest build name to project directory. --> | ||
| <BuildNamePathCandidate Include="@(OrchestratedManifestBuildNames)"> | ||
| <Path>%(ProjectDirectories.Identity)</Path> | ||
| <ProjectDirectorySourceProjectFile>%(ProjectDirectories.MSBuildSourceProjectFile)</ProjectDirectorySourceProjectFile> | ||
| </BuildNamePathCandidate> | ||
|
|
||
| <BuildNamePath Include="@(BuildNamePathCandidate)" | ||
| Condition="'%(MSBuildSourceProjectFile)' == '%(ProjectDirectorySourceProjectFile)' AND | ||
| '%(Identity)' != 'N/A'" /> | ||
|
|
||
| <!-- Join project directory to submodule URL. --> | ||
| <BuildNamePathGitUrlCandidate Include="@(BuildNamePath)"> | ||
| <Submodule>$(ProjectDir)%(SubmoduleConfigurations.Path)/</Submodule> | ||
| <GitUrl>%(SubmoduleConfigurations.Url)</GitUrl> | ||
| </BuildNamePathGitUrlCandidate> | ||
|
|
||
| <BuildNamePathGitUrl Include="@(BuildNamePathGitUrlCandidate)" | ||
| Condition="'%(Path)' == '%(Submodule)'" /> | ||
| <_ExtractedGitModuleProperties | ||
| Include="@(SubmoduleConfigurations)" | ||
| ProjectDirectory="$(ProjectDir)%(Path)/" | ||
| GitUrl="%(Url)" | ||
| KeepMetadata="Identity" /> | ||
| </ItemGroup> | ||
|
|
||
| <JoinItems | ||
| Left="@(_JoinProjectFileProperties)" LeftKey="ProjectDirectory" LeftMetadata="*" LeftItemSpec="Identity" | ||
| Right="@(_ExtractedGitModuleProperties)" RightKey="ProjectDirectory" RightMetadata="*"> | ||
| <Output TaskParameter="JoinResult" ItemName="RepoProjectWithProperties" /> | ||
| </JoinItems> | ||
|
|
||
| <ItemGroup> | ||
| <UpdateStep Include="@(BuildNamePathGitUrl)"> | ||
| <UpdaterType>Submodule from orchestrated build</UpdaterType> | ||
| <BuildName>%(BuildNamePathGitUrl.Identity)</BuildName> | ||
| </UpdateStep> | ||
| <UpdateStep | ||
| Include="@(RepoProjectWithProperties)" | ||
| Condition="'%(RepoProjectWithProperties.BuildName)' != 'N/A'" | ||
| UpdaterType="Submodule from orchestrated build" | ||
| Path="%(RepoProjectWithProperties.ProjectDirectory)" /> | ||
|
|
||
| <UpdateStep | ||
| Include="@(RepoProjectWithProperties)" | ||
| Condition=" | ||
| '%(RepoProjectWithProperties.BuildName)' != 'N/A' AND | ||
| '%(RepoProjectWithProperties.OfficialBuildId)' != ''" | ||
| UpdaterType="Build attribute from orchestrated build" | ||
| AttributeName="BuildId" | ||
| Path="%(RepoProjectWithProperties.Identity)" | ||
| ElementName="OfficialBuildId" /> | ||
| </ItemGroup> | ||
| </Target> | ||
| </Project> |
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
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
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
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
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
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
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
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
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
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
Submodule cli
updated
17 files
Submodule core-setup
updated
7 files
| +2 −2 | BranchInfo.props | |
| +0 −247 | buildpipeline/Core-Setup-Linux-BT.json | |
| +6 −6 | dependencies.props | |
| +8 −24 | dir.props | |
| +9 −1 | src/pkg/packaging/deb/package.props | |
| +2 −2 | src/pkg/packaging/dir.proj | |
| +5 −14 | src/pkg/packaging/rpm/package.props |
Submodule coreclr
updated
6 files
| +1 −1 | ILAsmVersion.txt | |
| +10 −10 | dependencies.props | |
| +7 −1 | src/gc/unix/gcenv.unix.cpp | |
| +6 −12 | src/pal/src/exception/signal.cpp | |
| +10 −2 | src/pal/src/misc/sysinfo.cpp | |
| +8 −1 | src/vm/gcenv.ee.cpp |
Submodule corefx
updated
71 files
Submodule sdk
updated
10 files
Submodule websdk
updated
from 01175f to 8a0016
Oops, something went wrong.
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.
There was a problem hiding this comment.
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)?There was a problem hiding this comment.
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.