update stylecop to require https in apache notice, fix test

This commit is contained in:
Tim Hess 2019-03-27 14:56:31 -05:00
Родитель a091005106
Коммит 6a62718973
2 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -2,7 +2,7 @@
"$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
"settings": {
"documentationRules": {
"copyrightText": "Copyright {copyrightYear} the original author or authors.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.",
"copyrightText": "Copyright {copyrightYear} the original author or authors.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttps://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.",
"xmlHeader": false,
"variables": {
"copyrightYear": "2017"

Просмотреть файл

@ -1041,7 +1041,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test
provider.UpdateSettingsFromDiscovery(instances, settings);
Assert.Equal("secondUser", settings.Username);
Assert.Equal("secondPassword", settings.Password);
Assert.Equal("https://foo.bar:8888/,http://foo.bar.baz:9999/configPath", settings.Uri);
Assert.Equal("https://foo.bar:8888/,https://foo.bar.baz:9999/configPath", settings.Uri);
}
[Fact]