From f7672266e254d01677579e9276ad8d81fcc24dee Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 31 Jan 2018 18:59:22 +0000 Subject: [PATCH 1/6] Updating submodule(s) BasicMiddleware => f2676babd3b7780573c40800dd916c7ad9195285 [auto-updated: submodules] --- modules/BasicMiddleware | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware index aa0395847f..f2676babd3 160000 --- a/modules/BasicMiddleware +++ b/modules/BasicMiddleware @@ -1 +1 @@ -Subproject commit aa0395847f50ed4c1e6573d7aed46549c8819f6b +Subproject commit f2676babd3b7780573c40800dd916c7ad9195285 From ee839e712d67d40bca5ed644fb9634418de07d99 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 31 Jan 2018 13:58:17 -0800 Subject: [PATCH 2/6] Updating submodule(s) Identity => aa92069287f37e7abc92e474b9a95e63cee6c00b [auto-updated: submodules] --- modules/Identity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Identity b/modules/Identity index 185482c8cf..aa92069287 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 185482c8cfdcf4a267fb8b90e3fce48a00ab3076 +Subproject commit aa92069287f37e7abc92e474b9a95e63cee6c00b From c4888b97a2f79a9672e621c2324ba851638d972a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 31 Jan 2018 14:57:59 -0800 Subject: [PATCH 3/6] Add script to batch update travis and appveyor yml files (#834) [ci skip] --- .gitignore | 1 + korebuild.json | 2 +- scripts/requirements.txt | 2 + scripts/update_travis_appveyor_yml.py | 100 ++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 scripts/requirements.txt create mode 100755 scripts/update_travis_appveyor_yml.py diff --git a/.gitignore b/.gitignore index be57879a77..d5950872a2 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ node_modules .deps global.json msbuild.ProjectImports.zip +.env diff --git a/korebuild.json b/korebuild.json index 13e865430d..678d8bb948 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,4 +1,4 @@ { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json", "channel": "release/2.1" } diff --git a/scripts/requirements.txt b/scripts/requirements.txt new file mode 100644 index 0000000000..a550da3e64 --- /dev/null +++ b/scripts/requirements.txt @@ -0,0 +1,2 @@ +PyYAML==3.12 +termcolor==1.1.0 diff --git a/scripts/update_travis_appveyor_yml.py b/scripts/update_travis_appveyor_yml.py new file mode 100755 index 0000000000..e77bcc25c3 --- /dev/null +++ b/scripts/update_travis_appveyor_yml.py @@ -0,0 +1,100 @@ +#!/usr/bin/env python3 + +import collections +import glob +import yaml +from os import path +from termcolor import colored, cprint +from yaml.constructor import Constructor + +def dump_format(dump, tag, mapping, flow_style=None): + """ + Better output formatting for YAML dictionaries + """ + value = [] + node = yaml.MappingNode(tag, value, flow_style=flow_style) + if dump.alias_key is not None: + dump.represented_objects[dump.alias_key] = node + best_style = True + if hasattr(mapping, 'items'): + mapping = mapping.items() + for item_key, item_value in mapping: + node_key = dump.represent_data(item_key) + node_value = dump.represent_data(item_value) + if not (isinstance(node_key, yaml.ScalarNode) and not node_key.style): + best_style = False + if not (isinstance(node_value, yaml.ScalarNode) and not node_value.style): + best_style = False + value.append((node_key, node_value)) + if flow_style is None: + if dump.default_flow_style is not None: + node.flow_style = dump.default_flow_style + else: + node.flow_style = best_style + return node + + +def add_bool_as_scalar(self, node): + """ + Don't auto-parse boolean values + """ + if node.value == 'true' or node.value == 'false' : + return self.construct_yaml_bool(node) + return self.construct_scalar(node) + +_mapping_tag = yaml.resolver.BaseResolver.DEFAULT_MAPPING_TAG + +def dict_representer(dumper, data): + return dumper.represent_mapping(_mapping_tag, data.iteritems()) + + +def dict_constructor(loader, node): + return collections.OrderedDict(loader.construct_pairs(node)) + +def update(pattern, updater): + print('\n\n\n') + cprint(pattern, 'magenta') + + for f in glob.glob(path.join(repo_root, "modules", "*", pattern)): + yml = path.join(repo_root, f) + + if not path.exists(yml): + cprint("File does not exist: {}".format(yml), 'red') + continue + + print("Updating {}".format(yml)) + document = yaml.load(open(yml, 'r')) + document = updater(document) + yml_file = open(yml, 'w') + yml_file.write(yaml.safe_dump(document, default_flow_style=False, indent=2)) + yml_file.close() + +# +# Config yaml parser +# + +# Do not reorder keys in yaml file +yaml.add_representer(collections.OrderedDict, dict_representer) +yaml.add_constructor(_mapping_tag, dict_constructor) +# Pretty print dictionaries +yaml.SafeDumper.add_representer(collections.OrderedDict, + lambda dumper, value: dump_format(dumper, u'tag:yaml.org,2002:map', value)) +# Don't parse booleans - treat them as scalars +yaml.Loader.add_constructor(u'tag:yaml.org,2002:bool', add_bool_as_scalar) +yaml.SafeLoader.add_constructor(u'tag:yaml.org,2002:bool', add_bool_as_scalar) + +# +# Main +# + +repo_root = path.dirname(path.dirname(path.abspath(__file__))) + +def transform_yaml_doc(document): + if not 'branches' in document: + document['branches'] = {} + document['branches']['only'] = [ + 'dev', '/^release\/.*$/', '/^(.*\/)?ci-.*$/'] + return document + +update(".travis.yml", transform_yaml_doc) +update(".appveyor.yml", transform_yaml_doc) From fae79d059117b39ffca4c54e48b7b5085578173a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 31 Jan 2018 16:16:22 -0800 Subject: [PATCH 4/6] Updating submodule(s) Antiforgery => d2cfd09acf49b13b1fa942e84f35c4062ae9c866 AuthSamples => 3212b45dcbc9b6338d7fa4f8a9f4f9e946226814 AzureIntegration => 9645612ae3b5770cc54661b9d2587382aa2b79cf BasicMiddleware => 237ae410ffd57e1976f634b52cdf7e75623814a7 BrowserLink => 2b949cc1ffa4e91b98be2e01a4278f4d70b4e1f5 Caching => d073ffbccc946cd4913d433a9769bf5ad541944b Common => 589c79b2a0efa18ed3368c26f75d3df1c78b857b Configuration => 4b03172691e41a04f3ca906536a8000582a68964 CORS => 302f687487f0793af01596e6604ab9f5e9053987 DataProtection => 232329866788d50eb349ac3ce460f3bd292965ad DependencyInjection => b5a440897f54ce08b78cdf5c23b056ca768cdc55 Diagnostics => 93dbe3635d5405d96e0b44772a788ee7773c9934 DotNetTools => 52c688c4cdc8bc5065c0ea05865664a47c0dc371 EntityFrameworkCore => 5aae6e33b2978897a51f76675e3565582366283e EventNotification => c97c109ff73a03604147d8d039da2a7dea6503f9 FileSystem => e43b4649625d83f03814d47c01562a255cce34ef Hosting => 86989413f6252ad45824632e17dd123280b9d2de HtmlAbstractions => a7219e0c5cdc1de5cf6f5871b3f2b89b9d7e5040 HttpAbstractions => 3e99312192b9444d16dff4d98885cfa4c8953be6 HttpClientFactory => 3a68c1875246474a4b73099bdf7370cd4388ff6d HttpSysServer => c4904acddadfc69a6da83e17ce771333de02dcab Identity => 5c8d419b0cdc6e8595a71971767ed86f0d2aec33 IISIntegration => 2ed691a96058312d87fc64ce051ad6b559ed2f25 JavaScriptServices => f35c814fc76b544b984a7520d79771c5c03a1b27 JsonPatch => 829db1aae540b51ac3b5e369ae8b13863e63ef73 KestrelHttpServer => a5f78264f4368afed3ead6d97cf8fb1bb33eb493 Localization => 1ab0584db2a3b07f614880a0410b16cf2329f386 Logging => 13a401e70145a8751b1709e2e27e8e95338a67ce MetaPackages => 381f3a7414c3c0f1c6d9a2fe30a643d34396bf23 Microsoft.Data.Sqlite => 2b0794eae2e4d6fbf9082cc09829a09e7fbfbece MusicStore => d7bb4b0c5c0e9f9b89376a6d5464dc745c01bc75 Mvc => 4921bcf7b4b581e178395993fa501f7dd6aac497 MvcPrecompilation => a40b40bc4271b45a29800cc6f0b8d8378384369c Options => fe5b409e31522bdd370c47aaa34715349ddb4dca Proxy => 2261bd8483b554e4cf1c0a8be9208cf6a3f50868 Razor => 8653225b0cf5f45ac0418c1edde761f786e769f8 ResponseCaching => c749fd0a8066a8bb2c5401323592f6076af248ec Routing => c5c10b5ed12973eb6d642bf5cad92f9c1e98056f Scaffolding => da503e07d759fd9522694f7f8dafef543730fdb4 Security => 088dc56f3daad861abbdd1ad665a85b99d65e848 ServerTests => 151b58bd77b4771dc5e1a4ab19c5003e795f64d6 Session => 130b3e7e5850f2ca67183c982492556fd1ece471 SignalR => 5dd6543d15ad10fa840eb3991cd1a6b5e4d8ab64 StaticFiles => 8113ef5d862ba786b21714d9b4a520499f60081b Templating => 7e43fae45d2176e7a66e0f3d26a2eb0f2fe610ff Testing => c65513746d0dcfbc017489cb9ef5ddbb72bb7a98 WebHooks => bf5f4e273cc1c51e71df2c981667cb0b3b2248f7 WebSockets => f173f3f08f45da0f353656cf0dc585fec65d5353 [auto-updated: submodules] --- modules/Antiforgery | 2 +- modules/AuthSamples | 2 +- modules/AzureIntegration | 2 +- modules/BasicMiddleware | 2 +- modules/BrowserLink | 2 +- modules/CORS | 2 +- modules/Caching | 2 +- modules/Common | 2 +- modules/Configuration | 2 +- modules/DataProtection | 2 +- modules/DependencyInjection | 2 +- modules/Diagnostics | 2 +- modules/DotNetTools | 2 +- modules/EntityFrameworkCore | 2 +- modules/EventNotification | 2 +- modules/FileSystem | 2 +- modules/Hosting | 2 +- modules/HtmlAbstractions | 2 +- modules/HttpAbstractions | 2 +- modules/HttpClientFactory | 2 +- modules/HttpSysServer | 2 +- modules/IISIntegration | 2 +- modules/Identity | 2 +- modules/JavaScriptServices | 2 +- modules/JsonPatch | 2 +- modules/KestrelHttpServer | 2 +- modules/Localization | 2 +- modules/Logging | 2 +- modules/MetaPackages | 2 +- modules/Microsoft.Data.Sqlite | 2 +- modules/MusicStore | 2 +- modules/Mvc | 2 +- modules/MvcPrecompilation | 2 +- modules/Options | 2 +- modules/Proxy | 2 +- modules/Razor | 2 +- modules/ResponseCaching | 2 +- modules/Routing | 2 +- modules/Scaffolding | 2 +- modules/Security | 2 +- modules/ServerTests | 2 +- modules/Session | 2 +- modules/SignalR | 2 +- modules/StaticFiles | 2 +- modules/Templating | 2 +- modules/Testing | 2 +- modules/WebHooks | 2 +- modules/WebSockets | 2 +- 48 files changed, 48 insertions(+), 48 deletions(-) diff --git a/modules/Antiforgery b/modules/Antiforgery index 9022c60258..d2cfd09acf 160000 --- a/modules/Antiforgery +++ b/modules/Antiforgery @@ -1 +1 @@ -Subproject commit 9022c602580fae6eda761b9ae3d4ad9465dce09f +Subproject commit d2cfd09acf49b13b1fa942e84f35c4062ae9c866 diff --git a/modules/AuthSamples b/modules/AuthSamples index 857c0632a0..3212b45dcb 160000 --- a/modules/AuthSamples +++ b/modules/AuthSamples @@ -1 +1 @@ -Subproject commit 857c0632a05e405e1154831e2d4ad26c361f1c3e +Subproject commit 3212b45dcbc9b6338d7fa4f8a9f4f9e946226814 diff --git a/modules/AzureIntegration b/modules/AzureIntegration index b0bc3d111a..9645612ae3 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit b0bc3d111ab35b2a8c262887ccf50cd253e83e58 +Subproject commit 9645612ae3b5770cc54661b9d2587382aa2b79cf diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware index f2676babd3..237ae410ff 160000 --- a/modules/BasicMiddleware +++ b/modules/BasicMiddleware @@ -1 +1 @@ -Subproject commit f2676babd3b7780573c40800dd916c7ad9195285 +Subproject commit 237ae410ffd57e1976f634b52cdf7e75623814a7 diff --git a/modules/BrowserLink b/modules/BrowserLink index 0e1bcf9117..2b949cc1ff 160000 --- a/modules/BrowserLink +++ b/modules/BrowserLink @@ -1 +1 @@ -Subproject commit 0e1bcf9117142688a660e043079a7ba9260dbd10 +Subproject commit 2b949cc1ffa4e91b98be2e01a4278f4d70b4e1f5 diff --git a/modules/CORS b/modules/CORS index 7e27e805c4..302f687487 160000 --- a/modules/CORS +++ b/modules/CORS @@ -1 +1 @@ -Subproject commit 7e27e805c468f396ff5a87187be900f41e0cdad7 +Subproject commit 302f687487f0793af01596e6604ab9f5e9053987 diff --git a/modules/Caching b/modules/Caching index ffb6299d29..d073ffbccc 160000 --- a/modules/Caching +++ b/modules/Caching @@ -1 +1 @@ -Subproject commit ffb6299d296371294f83f535217f5e0f18ca1591 +Subproject commit d073ffbccc946cd4913d433a9769bf5ad541944b diff --git a/modules/Common b/modules/Common index 7c5604c2c2..589c79b2a0 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit 7c5604c2c2d8f08e67f14493550c5d4b984f1034 +Subproject commit 589c79b2a0efa18ed3368c26f75d3df1c78b857b diff --git a/modules/Configuration b/modules/Configuration index 03d66d749e..4b03172691 160000 --- a/modules/Configuration +++ b/modules/Configuration @@ -1 +1 @@ -Subproject commit 03d66d749e161c93708c9cc2bcf2a011ad882485 +Subproject commit 4b03172691e41a04f3ca906536a8000582a68964 diff --git a/modules/DataProtection b/modules/DataProtection index 5ca8d3131f..2323298667 160000 --- a/modules/DataProtection +++ b/modules/DataProtection @@ -1 +1 @@ -Subproject commit 5ca8d3131fd26894b05c3d9644c2a28a6e93d50a +Subproject commit 232329866788d50eb349ac3ce460f3bd292965ad diff --git a/modules/DependencyInjection b/modules/DependencyInjection index 6c736b0ba6..b5a440897f 160000 --- a/modules/DependencyInjection +++ b/modules/DependencyInjection @@ -1 +1 @@ -Subproject commit 6c736b0ba6936f0e8f19fc6d4076c75057d54dab +Subproject commit b5a440897f54ce08b78cdf5c23b056ca768cdc55 diff --git a/modules/Diagnostics b/modules/Diagnostics index c110d3f456..93dbe3635d 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit c110d3f456acc5bf61cbdb11c969a757924ac6ac +Subproject commit 93dbe3635d5405d96e0b44772a788ee7773c9934 diff --git a/modules/DotNetTools b/modules/DotNetTools index af8d61395f..52c688c4cd 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit af8d61395f0aa052dbde8a053c8198982587013f +Subproject commit 52c688c4cdc8bc5065c0ea05865664a47c0dc371 diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index f2dc8c0709..5aae6e33b2 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit f2dc8c0709af75f69977b8bf8cb9f3ea34198a6f +Subproject commit 5aae6e33b2978897a51f76675e3565582366283e diff --git a/modules/EventNotification b/modules/EventNotification index d28543872d..c97c109ff7 160000 --- a/modules/EventNotification +++ b/modules/EventNotification @@ -1 +1 @@ -Subproject commit d28543872de7c475af6c07440f69b6a442d0f6c2 +Subproject commit c97c109ff73a03604147d8d039da2a7dea6503f9 diff --git a/modules/FileSystem b/modules/FileSystem index c59f1af6dc..e43b464962 160000 --- a/modules/FileSystem +++ b/modules/FileSystem @@ -1 +1 @@ -Subproject commit c59f1af6dca9def3d0f004f5b27a2d6d94a082d7 +Subproject commit e43b4649625d83f03814d47c01562a255cce34ef diff --git a/modules/Hosting b/modules/Hosting index a2cef1cebb..86989413f6 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit a2cef1cebb060b224e8571b83387c3448d4ce578 +Subproject commit 86989413f6252ad45824632e17dd123280b9d2de diff --git a/modules/HtmlAbstractions b/modules/HtmlAbstractions index d208eca57f..a7219e0c5c 160000 --- a/modules/HtmlAbstractions +++ b/modules/HtmlAbstractions @@ -1 +1 @@ -Subproject commit d208eca57fdd0af1e2a638eb2feed891dc8aa146 +Subproject commit a7219e0c5cdc1de5cf6f5871b3f2b89b9d7e5040 diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions index 345c4254d3..3e99312192 160000 --- a/modules/HttpAbstractions +++ b/modules/HttpAbstractions @@ -1 +1 @@ -Subproject commit 345c4254d3f632b935ab3394f6cb09587c20af19 +Subproject commit 3e99312192b9444d16dff4d98885cfa4c8953be6 diff --git a/modules/HttpClientFactory b/modules/HttpClientFactory index 964378e7d8..3a68c18752 160000 --- a/modules/HttpClientFactory +++ b/modules/HttpClientFactory @@ -1 +1 @@ -Subproject commit 964378e7d816ce3a56b87e840e1578780de62659 +Subproject commit 3a68c1875246474a4b73099bdf7370cd4388ff6d diff --git a/modules/HttpSysServer b/modules/HttpSysServer index 2e0c505002..c4904acdda 160000 --- a/modules/HttpSysServer +++ b/modules/HttpSysServer @@ -1 +1 @@ -Subproject commit 2e0c505002dfe94a90b9bdb59daf20c4e6725603 +Subproject commit c4904acddadfc69a6da83e17ce771333de02dcab diff --git a/modules/IISIntegration b/modules/IISIntegration index bc1a60704b..2ed691a960 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit bc1a60704b2cb5fb1effebe11fcefee82fcaa856 +Subproject commit 2ed691a96058312d87fc64ce051ad6b559ed2f25 diff --git a/modules/Identity b/modules/Identity index aa92069287..5c8d419b0c 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit aa92069287f37e7abc92e474b9a95e63cee6c00b +Subproject commit 5c8d419b0cdc6e8595a71971767ed86f0d2aec33 diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices index 116f33c66c..f35c814fc7 160000 --- a/modules/JavaScriptServices +++ b/modules/JavaScriptServices @@ -1 +1 @@ -Subproject commit 116f33c66c4671dfe98538966eb8fd3c06f29113 +Subproject commit f35c814fc76b544b984a7520d79771c5c03a1b27 diff --git a/modules/JsonPatch b/modules/JsonPatch index eafe3e7aa3..829db1aae5 160000 --- a/modules/JsonPatch +++ b/modules/JsonPatch @@ -1 +1 @@ -Subproject commit eafe3e7aa39c4023883394d4fbab16131d190295 +Subproject commit 829db1aae540b51ac3b5e369ae8b13863e63ef73 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index a84095e5c3..a5f78264f4 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit a84095e5c3a61a329bca5819183de608067d0394 +Subproject commit a5f78264f4368afed3ead6d97cf8fb1bb33eb493 diff --git a/modules/Localization b/modules/Localization index a633e4d657..1ab0584db2 160000 --- a/modules/Localization +++ b/modules/Localization @@ -1 +1 @@ -Subproject commit a633e4d657e4d3313d51e0b7f8bb62362d551d83 +Subproject commit 1ab0584db2a3b07f614880a0410b16cf2329f386 diff --git a/modules/Logging b/modules/Logging index 25bb882cbf..13a401e701 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit 25bb882cbfe5729e8d482350c9e828b6a0630e8f +Subproject commit 13a401e70145a8751b1709e2e27e8e95338a67ce diff --git a/modules/MetaPackages b/modules/MetaPackages index 1525559bab..381f3a7414 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit 1525559baba37384df540bd094b28aec8b9e24db +Subproject commit 381f3a7414c3c0f1c6d9a2fe30a643d34396bf23 diff --git a/modules/Microsoft.Data.Sqlite b/modules/Microsoft.Data.Sqlite index fe87c11026..2b0794eae2 160000 --- a/modules/Microsoft.Data.Sqlite +++ b/modules/Microsoft.Data.Sqlite @@ -1 +1 @@ -Subproject commit fe87c1102661421dfdb3d16b24c064cee7dffe12 +Subproject commit 2b0794eae2e4d6fbf9082cc09829a09e7fbfbece diff --git a/modules/MusicStore b/modules/MusicStore index 90ebe2672a..d7bb4b0c5c 160000 --- a/modules/MusicStore +++ b/modules/MusicStore @@ -1 +1 @@ -Subproject commit 90ebe2672aa3fa2d366279519868f6f470d426f7 +Subproject commit d7bb4b0c5c0e9f9b89376a6d5464dc745c01bc75 diff --git a/modules/Mvc b/modules/Mvc index e5fb72c300..4921bcf7b4 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit e5fb72c3009a0e9981da89ca8487f756b1820759 +Subproject commit 4921bcf7b4b581e178395993fa501f7dd6aac497 diff --git a/modules/MvcPrecompilation b/modules/MvcPrecompilation index 812c854775..a40b40bc42 160000 --- a/modules/MvcPrecompilation +++ b/modules/MvcPrecompilation @@ -1 +1 @@ -Subproject commit 812c85477551f17c8077a3a951e2fcedd742d5e7 +Subproject commit a40b40bc4271b45a29800cc6f0b8d8378384369c diff --git a/modules/Options b/modules/Options index 288e3ac5dd..fe5b409e31 160000 --- a/modules/Options +++ b/modules/Options @@ -1 +1 @@ -Subproject commit 288e3ac5dd254d6491913e7923a1ff491e23fca1 +Subproject commit fe5b409e31522bdd370c47aaa34715349ddb4dca diff --git a/modules/Proxy b/modules/Proxy index c2fd01b902..2261bd8483 160000 --- a/modules/Proxy +++ b/modules/Proxy @@ -1 +1 @@ -Subproject commit c2fd01b902c4bc52f48e148a09f63ac20fb75c09 +Subproject commit 2261bd8483b554e4cf1c0a8be9208cf6a3f50868 diff --git a/modules/Razor b/modules/Razor index 766862390b..8653225b0c 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit 766862390b52db5fd4e6e8e502cf2949e7d74eb6 +Subproject commit 8653225b0cf5f45ac0418c1edde761f786e769f8 diff --git a/modules/ResponseCaching b/modules/ResponseCaching index f9ce4f22f1..c749fd0a80 160000 --- a/modules/ResponseCaching +++ b/modules/ResponseCaching @@ -1 +1 @@ -Subproject commit f9ce4f22f164477e8958d1c44459dae2777f43fc +Subproject commit c749fd0a8066a8bb2c5401323592f6076af248ec diff --git a/modules/Routing b/modules/Routing index d5af99075b..c5c10b5ed1 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit d5af99075bd1369dc14b08b83c2b9396131843ba +Subproject commit c5c10b5ed12973eb6d642bf5cad92f9c1e98056f diff --git a/modules/Scaffolding b/modules/Scaffolding index 62a0e4dba2..da503e07d7 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit 62a0e4dba22de3701884966915101bc29fa487a2 +Subproject commit da503e07d759fd9522694f7f8dafef543730fdb4 diff --git a/modules/Security b/modules/Security index c534335cb0..088dc56f3d 160000 --- a/modules/Security +++ b/modules/Security @@ -1 +1 @@ -Subproject commit c534335cb0b10b45708e2be2f94a94a86d6148a2 +Subproject commit 088dc56f3daad861abbdd1ad665a85b99d65e848 diff --git a/modules/ServerTests b/modules/ServerTests index 0ca78b89c5..151b58bd77 160000 --- a/modules/ServerTests +++ b/modules/ServerTests @@ -1 +1 @@ -Subproject commit 0ca78b89c53bb3680ff0fdbc93b772de28267fce +Subproject commit 151b58bd77b4771dc5e1a4ab19c5003e795f64d6 diff --git a/modules/Session b/modules/Session index d34600a1d3..130b3e7e58 160000 --- a/modules/Session +++ b/modules/Session @@ -1 +1 @@ -Subproject commit d34600a1d3e6f734671afa0e600777475a328fab +Subproject commit 130b3e7e5850f2ca67183c982492556fd1ece471 diff --git a/modules/SignalR b/modules/SignalR index ac9db5dc7b..5dd6543d15 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit ac9db5dc7b9b8972c56b154a8433f4d522138d2d +Subproject commit 5dd6543d15ad10fa840eb3991cd1a6b5e4d8ab64 diff --git a/modules/StaticFiles b/modules/StaticFiles index 693f7f4ef2..8113ef5d86 160000 --- a/modules/StaticFiles +++ b/modules/StaticFiles @@ -1 +1 @@ -Subproject commit 693f7f4ef29d7dcd6f801f6780fe5d59a1056058 +Subproject commit 8113ef5d862ba786b21714d9b4a520499f60081b diff --git a/modules/Templating b/modules/Templating index ec90252b85..7e43fae45d 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit ec90252b85e263bf9b9b1bcc2950dfedd928ed71 +Subproject commit 7e43fae45d2176e7a66e0f3d26a2eb0f2fe610ff diff --git a/modules/Testing b/modules/Testing index 5f7f056395..c65513746d 160000 --- a/modules/Testing +++ b/modules/Testing @@ -1 +1 @@ -Subproject commit 5f7f056395e6081140ca04f77796c70f51af85e3 +Subproject commit c65513746d0dcfbc017489cb9ef5ddbb72bb7a98 diff --git a/modules/WebHooks b/modules/WebHooks index b1946ab7d8..bf5f4e273c 160000 --- a/modules/WebHooks +++ b/modules/WebHooks @@ -1 +1 @@ -Subproject commit b1946ab7d8204aa5b0025189cf77ec755b8fa95d +Subproject commit bf5f4e273cc1c51e71df2c981667cb0b3b2248f7 diff --git a/modules/WebSockets b/modules/WebSockets index 5b18df55cb..f173f3f08f 160000 --- a/modules/WebSockets +++ b/modules/WebSockets @@ -1 +1 @@ -Subproject commit 5b18df55cbe1230dca759ffead9acbe31b425799 +Subproject commit f173f3f08f45da0f353656cf0dc585fec65d5353 From ebe17e29d4fdbf94d27eb6c67c87e78ff8406950 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 31 Jan 2018 18:03:00 -0800 Subject: [PATCH 5/6] Updating submodule(s) Hosting => f8d61a4c522a9200c22b3141c50d6b4c00d3c393 [auto-updated: submodules] --- modules/Hosting | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Hosting b/modules/Hosting index 86989413f6..f8d61a4c52 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit 86989413f6252ad45824632e17dd123280b9d2de +Subproject commit f8d61a4c522a9200c22b3141c50d6b4c00d3c393 From 2233481d341d3ca36c2ded9f0a8894ad93f86e1b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 1 Feb 2018 10:24:07 -0800 Subject: [PATCH 6/6] Ensure all packages are included in ArtifactInfo --- build/Publish.targets | 9 +++++++-- build/SharedFx.targets | 18 ++++++++++++++++++ build/Templating.targets | 32 ++++++++++++++++++++++++-------- src/Directory.Build.targets | 11 +++++++++++ 4 files changed, 60 insertions(+), 10 deletions(-) create mode 100644 src/Directory.Build.targets diff --git a/build/Publish.targets b/build/Publish.targets index 6b35b0ccb5..1c8cb52bed 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -55,7 +55,7 @@ Value="$(PackageVersion)" /> - + Runtime/$(PackageVersion)/ Runtime/$(SharedFxCliBlobChannel)/ @@ -133,7 +133,12 @@ - + + <_MissingPackages Include="@(PackageArtifact)" /> + <_MissingPackages Remove="%(PackagesToPublish.PackageId)" /> + + + diff --git a/build/SharedFx.targets b/build/SharedFx.targets index e99488ad7c..a6aca1bbb0 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -2,10 +2,28 @@ + + $(GetArtifactInfoDependsOn);GetMetapackageArtifactInfo + + $([MSBuild]::NormalizeDirectory($(ArtifactsDir)))assets\Runtime\$(PackageVersion)\ + + + <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.All\Microsoft.AspNetCore.All.csproj" /> + <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.App\Microsoft.AspNetCore.App.csproj" /> + <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Analyzers\Microsoft.AspNetCore.Analyzers.csproj" /> + + + + + + + $(_MetapackageSrcRoot)$(MetapackageName)\ diff --git a/build/Templating.targets b/build/Templating.targets index c199b1c775..8ef7591a43 100644 --- a/build/Templating.targets +++ b/build/Templating.targets @@ -1,24 +1,40 @@ $(MSBuildThisFileDirectory)..\modules\Templating\ + $(GetArtifactInfoDependsOn);GetTemplateArtifactInfo + + + RepositoryRoot=$(TemplatingProjectRoot); + BuildNumber=$(BuildNumber); + Configuration=$(Configuration); + IsFinalBuild=$(IsFinalBuild); + + + + + + + + + - - RepositoryRoot=$(TemplatingProjectRoot); + <_BuildTemplateProjProperties> + $(TemplateProjProperties); + SkipAspNetCoreRuntimeInstall=true; DotNetRestoreSourcesPropsPath=$(GeneratedRestoreSourcesPropsPath); DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath); - BuildNumber=$(BuildNumber); - Configuration=$(Configuration); - IsFinalBuild=$(IsFinalBuild); - SkipAspNetCoreRuntimeInstall=true; - + SkipTests=true; + + Properties="$(_BuildTemplateProjProperties)" /> diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets new file mode 100644 index 0000000000..db9b73869a --- /dev/null +++ b/src/Directory.Build.targets @@ -0,0 +1,11 @@ + + + + + NuGetPackage + $(PackageId) + $(PackageVersion) + + + +