Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric St. John <ericstj@microsoft.com>2017-09-29 22:29:02 +0300
committerEric St. John <ericstj@microsoft.com>2017-09-29 22:29:02 +0300
commit989a84f355eb6df5612f37bc783510e2d6b4e4c9 (patch)
tree3197e1f6e094b91df66eb9b0d4c83d68e8182f0b /pkg/Microsoft.NETCore.Platforms
parent25b0a9b6f784216de7f357ba680aa9a835ad3cba (diff)
Run GenerateRuntimeGraph during build
This turns GenerateRuntimeGraph back on, but it will now only check consistency of the generated runtime files with what is checked in. If it detects an inconsistency the build will fail and this project can be rebuilt specifying /p:UpdateRuntimeFiles=true to commit the updates.
Diffstat (limited to 'pkg/Microsoft.NETCore.Platforms')
-rw-r--r--pkg/Microsoft.NETCore.Platforms/readme.md2
-rw-r--r--pkg/Microsoft.NETCore.Platforms/runtimeGroups.props11
2 files changed, 7 insertions, 6 deletions
diff --git a/pkg/Microsoft.NETCore.Platforms/readme.md b/pkg/Microsoft.NETCore.Platforms/readme.md
index 46d347c7e4..a4b7b667bd 100644
--- a/pkg/Microsoft.NETCore.Platforms/readme.md
+++ b/pkg/Microsoft.NETCore.Platforms/readme.md
@@ -100,7 +100,7 @@ For example:
This will create a new RID for `myLinuxDistro` where `myLinuxDistro` should be the string used for the `ID=` value in the `/etc/os-release` file.
-Whenever modifying the `runtimeGroups.props` you should rebuild the project so that your changes will be regenerated in the checked-in `runtime.json`.
+Whenever modifying the `runtimeGroups.props` you should rebuild the project with `/p:UpdateRuntimeFiles=true` so that your changes will be regenerated in the checked-in `runtime.json`.
RuntimeGroup items have the following format:
- `Identity`: the base string for the RID, without version architecture, or qualifiers.
diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index f74ecd1e46..0f2b4a4197 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -140,14 +140,15 @@
</RuntimeGroupWithQualifiers>
</ItemGroup>
- <Target Name="GenerateRuntimeJson">
- <!-- Note that we intentionally modify the runtime*json that is under source control.
- We want to keep this up to date in source control so that we can see the diff in the
- runtime.json over time as changes are made to RuntimeGroups. -->
+ <Target Name="GenerateRuntimeJson" BeforeTargets="CreatePackage">
+ <!-- Generates a Runtime graph using RuntimeGroups and diffs it with the graph described by runtime.json and runtime.compatibility.json
+ Specifying UpdateRuntimeFiles=true skips the diff and updates those files.
+ The graph can be visualized using the generated dmgl -->
<MakeDir Directories="$(PackageReportDir)" />
<GenerateRuntimeGraph RuntimeGroups="@(RuntimeGroupWithQualifiers)"
RuntimeJson="runtime.json"
CompatibilityMap="runtime.compatibility.json"
- RuntimeDirectedGraph="$(PackageReportDir)$(Id)$(NuspecSuffix)-runtime.json.dgml" />
+ RuntimeDirectedGraph="$(PackageReportDir)$(Id)$(NuspecSuffix)-runtime.json.dgml"
+ UpdateRuntimeFiles="$(UpdateRuntimeFiles)" />
</Target>
</Project> \ No newline at end of file