Skip to content

Commit 9575616

Browse files
commonsensesoftwarecommonsensesoftware
authored
Upgrade to VS2017 (#99)
1 parent 7e2521c commit 9575616

File tree

294 files changed

+1903
-2285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+1903
-2285
lines changed

‎.editorconfig

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# EditorConfig is awesome
2+
# * http://EditorConfig.org
3+
# * https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
4+
5+
# top-most .editorconfig file
6+
root = true
7+
8+
# don't use tabs for indentation
9+
[*]
10+
indent_style = space
11+
12+
# code files
13+
[*.{cs,csx,vb,vbx}]
14+
indent_size = 4
15+
16+
# xml project files
17+
[*.{csproj,vbproj,proj,projitems,shproj}]
18+
indent_size = 2
19+
20+
# xml config files
21+
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
22+
indent_size = 2
23+
24+
# json files
25+
[*.json]
26+
indent_size = 2
27+
28+
# whitespace handling
29+
trim_trailing_whitespace = true
30+
insert_final_newline = false
31+
32+
# .net code style settings:
33+
[*.{cs,vb}]
34+
dotnet_sort_system_directives_first = false
35+
36+
# avoid "this." and "me." if not necessary
37+
dotnet_style_qualification_for_field = false:suggestion
38+
dotnet_style_qualification_for_property = false:suggestion
39+
dotnet_style_qualification_for_method = false:suggestion
40+
dotnet_style_qualification_for_event = false:suggestion
41+
42+
# use language keywords instead of framework type names for type references
43+
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
44+
dotnet_style_predefined_type_for_member_access = true:suggestion
45+
46+
# suggest more modern language features when available
47+
dotnet_style_object_initializer = true:suggestion
48+
dotnet_style_collection_initializer = true:suggestion
49+
dotnet_style_coalesce_expression = true:suggestion
50+
dotnet_style_null_propagation = true:suggestion
51+
dotnet_style_explicit_tuple_names = true:suggestion
52+
53+
# csharp code style settings:
54+
[*.cs]
55+
56+
# prefer "var" everywhere
57+
csharp_style_var_for_built_in_types = true:suggestion
58+
csharp_style_var_when_type_is_apparent = true:suggestion
59+
csharp_style_var_elsewhere = true:suggestion
60+
61+
# prefer method-like constructs to have a block body
62+
csharp_style_expression_bodied_methods = false:none
63+
csharp_style_expression_bodied_constructors = false:none
64+
csharp_style_expression_bodied_operators = false:none
65+
66+
# prefer property-like constructs to have an expression-body
67+
csharp_style_expression_bodied_properties = true:none
68+
csharp_style_expression_bodied_indexers = true:none
69+
csharp_style_expression_bodied_accessors = true:none
70+
71+
# suggest more modern language features when available
72+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
73+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
74+
csharp_style_inlined_variable_declaration = true:suggestion
75+
csharp_style_throw_expression = true:suggestion
76+
csharp_style_conditional_delegate_call = true:suggestion
77+
78+
# newline settings
79+
csharp_new_line_before_open_brace = all
80+
csharp_new_line_before_else = true
81+
csharp_new_line_before_catch = true
82+
csharp_new_line_before_finally = true
83+
csharp_new_line_before_members_in_object_initializers = false
84+
csharp_new_line_before_members_in_anonymous_types = false

‎ApiVersioning.sln

+30-84
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,58 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.4
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4D5F5F21-0CB7-4B4E-A42F-732BD4AFD0FF}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{2EB04F47-AD85-4169-BA08-9104D9D29332}"
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0987757E-4D09-4523-B9C9-65B1E8832AA1}"
99
ProjectSection(SolutionItems) = preProject
10-
src\Shared\Arg.cs = src\Shared\Arg.cs
11-
src\Shared\CustomDictionary.xml = src\Shared\CustomDictionary.xml
12-
src\Shared\SharedAssemblyInfo.cs = src\Shared\SharedAssemblyInfo.cs
13-
src\Shared\StringExtensions.cs = src\Shared\StringExtensions.cs
10+
test\.editorconfig = test\.editorconfig
1411
EndProjectSection
1512
EndProject
16-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0987757E-4D09-4523-B9C9-65B1E8832AA1}"
17-
EndProject
18-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2957BAF3-9E50-4D82-B732-A34345C4A8F2}"
13+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{2957BAF3-9E50-4D82-B732-A34345C4A8F2}"
1914
ProjectSection(SolutionItems) = preProject
15+
.editorconfig = .editorconfig
2016
.gitattributes = .gitattributes
2117
.gitignore = .gitignore
2218
appveyor.yml = appveyor.yml
23-
global.json = global.json
19+
build.targets = build.targets
20+
CustomDictionary.xml = CustomDictionary.xml
2421
LICENSE = LICENSE
25-
pack.ps1 = pack.ps1
2622
README.md = README.md
2723
EndProjectSection
2824
EndProject
29-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{261B77B4-647B-4459-9FE8-4EFF910B28D0}"
30-
ProjectSection(SolutionItems) = preProject
31-
src\Common\AdvertiseApiVersionsAttribute.cs = src\Common\AdvertiseApiVersionsAttribute.cs
32-
src\Common\ApiVersion.cs = src\Common\ApiVersion.cs
33-
src\Common\ApiVersionAttribute.cs = src\Common\ApiVersionAttribute.cs
34-
src\Common\ApiVersionNeutralAttribute.cs = src\Common\ApiVersionNeutralAttribute.cs
35-
src\Common\CollectionExtensions.cs = src\Common\CollectionExtensions.cs
36-
src\Common\ControllerNameAttribute.cs = src\Common\ControllerNameAttribute.cs
37-
src\Common\MapToApiVersionAttribute.cs = src\Common\MapToApiVersionAttribute.cs
38-
src\Common\ReportApiVersionsAttribute.cs = src\Common\ReportApiVersionsAttribute.cs
39-
src\Common\TypeExtensions.cs = src\Common\TypeExtensions.cs
40-
EndProjectSection
41-
EndProject
42-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Versioning", "Versioning", "{DE4EE45F-F8EA-4B32-B16F-441F946ACEF4}"
43-
ProjectSection(SolutionItems) = preProject
44-
src\Common\Versioning\AmbiguousApiVersionException.cs = src\Common\Versioning\AmbiguousApiVersionException.cs
45-
src\Common\Versioning\ApiVersioningOptions.cs = src\Common\Versioning\ApiVersioningOptions.cs
46-
src\Common\Versioning\ApiVersionModel.cs = src\Common\Versioning\ApiVersionModel.cs
47-
src\Common\Versioning\ApiVersionModelDebugView.cs = src\Common\Versioning\ApiVersionModelDebugView.cs
48-
src\Common\Versioning\ApiVersionModelExtensions.cs = src\Common\Versioning\ApiVersionModelExtensions.cs
49-
src\Common\Versioning\ApiVersionReader.cs = src\Common\Versioning\ApiVersionReader.cs
50-
src\Common\Versioning\ApiVersionsBaseAttribute.cs = src\Common\Versioning\ApiVersionsBaseAttribute.cs
51-
src\Common\Versioning\AttributeExtensions.cs = src\Common\Versioning\AttributeExtensions.cs
52-
src\Common\Versioning\ConstantApiVersionSelector.cs = src\Common\Versioning\ConstantApiVersionSelector.cs
53-
src\Common\Versioning\CurrentImplementationApiVersionSelector.cs = src\Common\Versioning\CurrentImplementationApiVersionSelector.cs
54-
src\Common\Versioning\DefaultApiVersionSelector.cs = src\Common\Versioning\DefaultApiVersionSelector.cs
55-
src\Common\Versioning\HeaderApiVersionReader.cs = src\Common\Versioning\HeaderApiVersionReader.cs
56-
src\Common\Versioning\IApiVersionNeutral.cs = src\Common\Versioning\IApiVersionNeutral.cs
57-
src\Common\Versioning\IApiVersionProvider.cs = src\Common\Versioning\IApiVersionProvider.cs
58-
src\Common\Versioning\IApiVersionReader.cs = src\Common\Versioning\IApiVersionReader.cs
59-
src\Common\Versioning\IApiVersionSelector.cs = src\Common\Versioning\IApiVersionSelector.cs
60-
src\Common\Versioning\LowestImplementedApiVersionSelector.cs = src\Common\Versioning\LowestImplementedApiVersionSelector.cs
61-
src\Common\Versioning\QueryStringApiVersionReader.cs = src\Common\Versioning\QueryStringApiVersionReader.cs
62-
src\Common\Versioning\QueryStringOrHeaderApiVersionReader.cs = src\Common\Versioning\QueryStringOrHeaderApiVersionReader.cs
63-
EndProjectSection
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Versioning", "src\Microsoft.AspNetCore.Mvc.Versioning\Microsoft.AspNetCore.Mvc.Versioning.csproj", "{C39CCCBC-6B04-406F-96BE-CA796EFF34C5}"
6426
EndProject
65-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{946F164B-5502-4629-AD75-04DD91D1128F}"
27+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.WebApi.Versioning", "src\Microsoft.AspNet.WebApi.Versioning\Microsoft.AspNet.WebApi.Versioning.csproj", "{3BAC97ED-1A8E-4F5A-A716-DB5255F51C81}"
6628
EndProject
67-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Versioning", "Versioning", "{8D4E3E25-E532-4EF7-A36E-CEEC098C04B1}"
68-
ProjectSection(SolutionItems) = preProject
69-
test\Common\Versioning\ApiVersionModelExtensionsTest.cs = test\Common\Versioning\ApiVersionModelExtensionsTest.cs
70-
test\Common\Versioning\MaxSelectVersionData.cs = test\Common\Versioning\MaxSelectVersionData.cs
71-
test\Common\Versioning\MinSelectVersionData.cs = test\Common\Versioning\MinSelectVersionData.cs
72-
test\Common\Versioning\SelectVersionData.cs = test\Common\Versioning\SelectVersionData.cs
73-
EndProjectSection
74-
ProjectSection(FolderStartupServices) = postProject
75-
{82A7F48D-3B50-4B1E-B82E-3ADA8210C358} = {82A7F48D-3B50-4B1E-B82E-3ADA8210C358}
76-
EndProjectSection
29+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.OData.Versioning", "src\Microsoft.AspNet.OData.Versioning\Microsoft.AspNet.OData.Versioning.csproj", "{48A2B488-23AB-4C83-AE30-0B8B735C4562}"
7730
EndProject
78-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Mvc.Versioning", "src\Microsoft.AspNetCore.Mvc.Versioning\Microsoft.AspNetCore.Mvc.Versioning.xproj", "{C39CCCBC-6B04-406F-96BE-CA796EFF34C5}"
31+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Versioning.Tests", "test\Microsoft.AspNetCore.Mvc.Versioning.Tests\Microsoft.AspNetCore.Mvc.Versioning.Tests.csproj", "{69C59656-53D1-4ACB-92B5-8B34C8E62175}"
7932
EndProject
80-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebApi.Versioning", "src\Microsoft.AspNet.WebApi.Versioning\Microsoft.AspNet.WebApi.Versioning.xproj", "{3BAC97ED-1A8E-4F5A-A716-DB5255F51C81}"
33+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.WebApi.Versioning.Tests", "test\Microsoft.AspNet.WebApi.Versioning.Tests\Microsoft.AspNet.WebApi.Versioning.Tests.csproj", "{AEB074E1-E57A-4DD3-A972-3625B367CE5D}"
8134
EndProject
82-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.OData.Versioning", "src\Microsoft.AspNet.OData.Versioning\Microsoft.AspNet.OData.Versioning.xproj", "{48A2B488-23AB-4C83-AE30-0B8B735C4562}"
35+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.OData.Versioning.Tests", "test\Microsoft.AspNet.OData.Versioning.Tests\Microsoft.AspNet.OData.Versioning.Tests.csproj", "{D87E54CC-C2D6-4AE5-806D-AE825B051C66}"
8336
EndProject
84-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Mvc.Versioning.Tests", "test\Microsoft.AspNetCore.Mvc.Versioning.Tests\Microsoft.AspNetCore.Mvc.Versioning.Tests.xproj", "{69C59656-53D1-4ACB-92B5-8B34C8E62175}"
37+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNet.WebApi.Acceptance.Tests", "test\Microsoft.AspNet.WebApi.Acceptance.Tests\Microsoft.AspNet.WebApi.Acceptance.Tests.csproj", "{5C31964D-EA8B-420B-9297-5ADFEFE54962}"
8538
EndProject
86-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebApi.Versioning.Tests", "test\Microsoft.AspNet.WebApi.Versioning.Tests\Microsoft.AspNet.WebApi.Versioning.Tests.xproj", "{AEB074E1-E57A-4DD3-A972-3625B367CE5D}"
39+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Acceptance.Tests", "test\Microsoft.AspNetCore.Mvc.Acceptance.Tests\Microsoft.AspNetCore.Mvc.Acceptance.Tests.csproj", "{4EED304C-D1A6-4866-8D7F-450D084FD25D}"
8740
EndProject
88-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.OData.Versioning.Tests", "test\Microsoft.AspNet.OData.Versioning.Tests\Microsoft.AspNet.OData.Versioning.Tests.xproj", "{D87E54CC-C2D6-4AE5-806D-AE825B051C66}"
41+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "src\Shared\Shared.shproj", "{B7897873-6757-4684-83C0-39575821AE14}"
8942
EndProject
90-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Conventions", "Conventions", "{B24995FB-AF48-4E5D-9327-377A599BDE2A}"
91-
ProjectSection(SolutionItems) = preProject
92-
src\Common\Versioning\Conventions\ActionApiVersionConventionBuilderCollectionT.cs = src\Common\Versioning\Conventions\ActionApiVersionConventionBuilderCollectionT.cs
93-
src\Common\Versioning\Conventions\ActionApiVersionConventionBuilderT.cs = src\Common\Versioning\Conventions\ActionApiVersionConventionBuilderT.cs
94-
src\Common\Versioning\Conventions\ActionApiVersionConventionBuilderTExtensions.cs = src\Common\Versioning\Conventions\ActionApiVersionConventionBuilderTExtensions.cs
95-
src\Common\Versioning\Conventions\ActionConventionBuilderTExtensions.cs = src\Common\Versioning\Conventions\ActionConventionBuilderTExtensions.cs
96-
src\Common\Versioning\Conventions\ControllerApiVersionConventionBuilderT.cs = src\Common\Versioning\Conventions\ControllerApiVersionConventionBuilderT.cs
97-
src\Common\Versioning\Conventions\ControllerApiVersionConventionBuilderTExtensions.cs = src\Common\Versioning\Conventions\ControllerApiVersionConventionBuilderTExtensions.cs
98-
src\Common\Versioning\Conventions\ExpressionExtensions.cs = src\Common\Versioning\Conventions\ExpressionExtensions.cs
99-
src\Common\Versioning\Conventions\IActionConventionBuilderT.cs = src\Common\Versioning\Conventions\IActionConventionBuilderT.cs
100-
src\Common\Versioning\Conventions\IApiVersionConventionT.cs = src\Common\Versioning\Conventions\IApiVersionConventionT.cs
101-
EndProjectSection
43+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Common", "src\Common\Common.shproj", "{6D0E834B-6422-44CD-9A85-E3BE9DEAD1BE}"
10244
EndProject
103-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebApi.Acceptance.Tests", "test\Microsoft.AspNet.WebApi.Acceptance.Tests\Microsoft.AspNet.WebApi.Acceptance.Tests.xproj", "{5C31964D-EA8B-420B-9297-5ADFEFE54962}"
45+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Test.Common", "test\Test.Common\Test.Common.shproj", "{F9297626-C37C-402B-AFD6-712F3E5E4D7C}"
10446
EndProject
105-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Mvc.Acceptance.Tests", "test\Microsoft.AspNetCore.Mvc.Acceptance.Tests\Microsoft.AspNetCore.Mvc.Acceptance.Tests.xproj", "{4EED304C-D1A6-4866-8D7F-450D084FD25D}"
47+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Acceptance.Test.Shared", "test\Acceptance.Test.Shared\Acceptance.Test.Shared.shproj", "{6CDFB878-2642-4F98-AE35-621BAC581181}"
10648
EndProject
10749
Global
50+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
51+
test\Acceptance.Test.Shared\Acceptance.Test.Shared.projitems*{6cdfb878-2642-4f98-ae35-621bac581181}*SharedItemsImports = 13
52+
src\Common\Common.projitems*{6d0e834b-6422-44cd-9a85-e3be9dead1be}*SharedItemsImports = 13
53+
src\Shared\Shared.projitems*{b7897873-6757-4684-83c0-39575821ae14}*SharedItemsImports = 13
54+
test\Test.Common\Test.Common.projitems*{f9297626-c37c-402b-afd6-712f3e5e4d7c}*SharedItemsImports = 13
55+
EndGlobalSection
10856
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10957
Debug|Any CPU = Debug|Any CPU
11058
Release|Any CPU = Release|Any CPU
@@ -147,19 +95,17 @@ Global
14795
HideSolutionNode = FALSE
14896
EndGlobalSection
14997
GlobalSection(NestedProjects) = preSolution
150-
{2EB04F47-AD85-4169-BA08-9104D9D29332} = {4D5F5F21-0CB7-4B4E-A42F-732BD4AFD0FF}
151-
{261B77B4-647B-4459-9FE8-4EFF910B28D0} = {4D5F5F21-0CB7-4B4E-A42F-732BD4AFD0FF}
152-
{DE4EE45F-F8EA-4B32-B16F-441F946ACEF4} = {261B77B4-647B-4459-9FE8-4EFF910B28D0}
153-
{946F164B-5502-4629-AD75-04DD91D1128F} = {0987757E-4D09-4523-B9C9-65B1E8832AA1}
154-
{8D4E3E25-E532-4EF7-A36E-CEEC098C04B1} = {946F164B-5502-4629-AD75-04DD91D1128F}
15598
{C39CCCBC-6B04-406F-96BE-CA796EFF34C5} = {4D5F5F21-0CB7-4B4E-A42F-732BD4AFD0FF}
15699
{3BAC97ED-1A8E-4F5A-A716-DB5255F51C81} = {4D5F5F21-0CB7-4B4E-A42F-732BD4AFD0FF}
157100
{48A2B488-23AB-4C83-AE30-0B8B735C4562} = {4D5F5F21-0CB7-4B4E-A42F-732BD4AFD0FF}
158101
{69C59656-53D1-4ACB-92B5-8B34C8E62175} = {0987757E-4D09-4523-B9C9-65B1E8832AA1}
159102
{AEB074E1-E57A-4DD3-A972-3625B367CE5D} = {0987757E-4D09-4523-B9C9-65B1E8832AA1}
160103
{D87E54CC-C2D6-4AE5-806D-AE825B051C66} = {0987757E-4D09-4523-B9C9-65B1E8832AA1}
161-
{B24995FB-AF48-4E5D-9327-377A599BDE2A} = {DE4EE45F-F8EA-4B32-B16F-441F946ACEF4}
162104
{5C31964D-EA8B-420B-9297-5ADFEFE54962} = {0987757E-4D09-4523-B9C9-65B1E8832AA1}
163105
{4EED304C-D1A6-4866-8D7F-450D084FD25D} = {0987757E-4D09-4523-B9C9-65B1E8832AA1}
106+
{B7897873-6757-4684-83C0-39575821AE14} = {4D5F5F21-0CB7-4B4E-A42F-732BD4AFD0FF}
107+
{6D0E834B-6422-44CD-9A85-E3BE9DEAD1BE} = {4D5F5F21-0CB7-4B4E-A42F-732BD4AFD0FF}
108+
{F9297626-C37C-402B-AFD6-712F3E5E4D7C} = {0987757E-4D09-4523-B9C9-65B1E8832AA1}
109+
{6CDFB878-2642-4F98-AE35-621BAC581181} = {0987757E-4D09-4523-B9C9-65B1E8832AA1}
164110
EndGlobalSection
165111
EndGlobal

0 commit comments

Comments
 (0)