Skip to content

Commit 33d1aea

Browse files
author
N. Taylor Mullen
committed
Transition to Netstandard.
- dotnet5.X => netstandard1.y (where y = x-1). - DNXCore50 => netstandardapp1.5. - Applied the same changes to ifdefs.
1 parent 12f33de commit 33d1aea

File tree

104 files changed

+430
-210
lines changed

Some content is hidden

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

104 files changed

+430
-210
lines changed

‎samples/ActionConstraintSample.Web/project.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
1313
},
1414
"frameworks": {
15-
"net451": { },
16-
"dnxcore50": {
17-
"imports": "portable-net451+win8",
15+
"net451": {},
16+
"netstandardapp1.5": {
17+
"imports": [
18+
"dnxcore50",
19+
"portable-net451+win8"
20+
],
1821
"dependencies": {
1922
"NETStandard.Library": "1.0.0-*"
2023
}

‎samples/CustomRouteSample.Web/project.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313
},
1414
"frameworks": {
1515
"net451": {},
16-
"dnxcore50": {
17-
"imports": "portable-net451+win8",
16+
"netstandardapp1.5": {
17+
"imports": [
18+
"dnxcore50",
19+
"portable-net451+win8"
20+
],
1821
"dependencies": {
1922
"NETStandard.Library": "1.0.0-*"
2023
}

‎samples/EmbeddedViewSample.Web/project.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
},
1616
"frameworks": {
1717
"net451": {},
18-
"dnxcore50": {
19-
"imports": "portable-net451+win8",
18+
"netstandardapp1.5": {
19+
"imports": [
20+
"dnxcore50",
21+
"portable-net451+win8"
22+
],
2023
"dependencies": {
2124
"NETStandard.Library": "1.0.0-*"
2225
}

‎samples/FormatFilterSample.Web/project.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414
},
1515
"frameworks": {
1616
"net451": {},
17-
"dnxcore50": {
18-
"imports": "portable-net451+win8",
17+
"netstandardapp1.5": {
18+
"imports": [
19+
"dnxcore50",
20+
"portable-net451+win8"
21+
],
1922
"dependencies": {
2023
"NETStandard.Library": "1.0.0-*"
2124
}

‎samples/InlineConstraintSample.Web/project.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313
},
1414
"frameworks": {
1515
"net451": {},
16-
"dnxcore50": {
17-
"imports": "portable-net451+win8",
16+
"netstandardapp1.5": {
17+
"imports": [
18+
"dnxcore50",
19+
"portable-net451+win8"
20+
],
1821
"dependencies": {
1922
"NETStandard.Library": "1.0.0-*"
2023
}

‎samples/JsonPatchSample.Web/project.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313
},
1414
"frameworks": {
1515
"net451": {},
16-
"dnxcore50": {
17-
"imports": "portable-net451+win8",
16+
"netstandardapp1.5": {
17+
"imports": [
18+
"dnxcore50",
19+
"portable-net451+win8"
20+
],
1821
"dependencies": {
1922
"NETStandard.Library": "1.0.0-*"
2023
}

‎samples/LocalizationSample.Web/project.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313
},
1414
"frameworks": {
1515
"net451": {},
16-
"dnxcore50": {
17-
"imports": "portable-net451+win8",
16+
"netstandardapp1.5": {
17+
"imports": [
18+
"dnxcore50",
19+
"portable-net451+win8"
20+
],
1821
"dependencies": {
1922
"NETStandard.Library": "1.0.0-*"
2023
}

‎samples/MvcSandbox/project.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@
2727
}
2828
},
2929
"net451": { },
30-
"dnxcore50": {
31-
"imports": "portable-net451+win8",
30+
"netstandardapp1.5": {
31+
"imports": [
32+
"dnxcore50",
33+
"portable-net451+win8"
34+
],
3235
"dependencies": {
3336
"NETStandard.Library": "1.0.0-*"
3437
}

‎samples/MvcSubAreaSample.Web/project.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@
1616
},
1717
"frameworks": {
1818
"net451": {},
19-
"dnxcore50": {
20-
"imports": "portable-net451+win8",
19+
"netstandardapp1.5": {
20+
"imports": [
21+
"dnxcore50",
22+
"portable-net451+win8"
23+
],
2124
"dependencies": {
2225
"NETStandard.Library": "1.0.0-*"
2326
}

‎samples/TagHelperSample.Web/project.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@
2121
},
2222
"frameworks": {
2323
"net451": {},
24-
"dnxcore50": {
25-
"imports": "portable-net451+win8",
24+
"netstandardapp1.5": {
25+
"imports": [
26+
"dnxcore50",
27+
"portable-net451+win8"
28+
],
2629
"dependencies": {
2730
"NETStandard.Library": "1.0.0-*"
2831
}

‎samples/UrlHelperSample.Web/project.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@
1212
},
1313
"frameworks": {
1414
"net451": {},
15-
"dnxcore50": {
16-
"imports": "portable-net451+win8",
15+
"netstandardapp1.5": {
16+
"imports": [
17+
"dnxcore50",
18+
"portable-net451+win8"
19+
],
1720
"dependencies": {
1821
"NETStandard.Library": "1.0.0-*"
1922
}

‎src/Microsoft.AspNetCore.Mvc.Abstractions/project.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"compilationOptions": {
99
"warningsAsErrors": true,
1010
"keyFile": "../../tools/Key.snk",
11-
"nowarn": [ "CS1591" ],
11+
"nowarn": [
12+
"CS1591"
13+
],
1214
"xmlDoc": true
1315
},
1416
"dependencies": {
@@ -33,13 +35,16 @@
3335
},
3436
"frameworks": {
3537
"net451": {},
36-
"dotnet5.4": {
38+
"netstandard1.3": {
3739
"dependencies": {
3840
"Microsoft.CSharp": "4.0.1-*",
3941
"System.ComponentModel.TypeConverter": "4.0.1-*",
4042
"System.Reflection.Extensions": "4.0.1-*",
4143
"System.Text.Encoding.Extensions": "4.0.11-*"
42-
}
44+
},
45+
"imports": [
46+
"dotnet5.4"
47+
]
4348
}
4449
}
4550
}

‎src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"compilationOptions": {
99
"warningsAsErrors": true,
1010
"keyFile": "../../tools/Key.snk",
11-
"nowarn": [ "CS1591" ],
11+
"nowarn": [
12+
"CS1591"
13+
],
1214
"xmlDoc": true
1315
},
1416
"dependencies": {
@@ -24,8 +26,11 @@
2426
},
2527
"frameworks": {
2628
"net451": {},
27-
"dotnet5.4": {
28-
"imports": "portable-net451+win8"
29+
"netstandard1.3": {
30+
"imports": [
31+
"dotnet5.4",
32+
"portable-net451+win8"
33+
]
2934
}
3035
}
3136
}

‎src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/CollectionModelBinder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Diagnostics;
88
using System.Globalization;
99
using System.Linq;
10-
#if DOTNET5_4
10+
#if NETSTANDARD1_3
1111
using System.Reflection;
1212
#endif
1313
using System.Threading.Tasks;

‎src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DictionaryModelBinder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Collections.Generic;
66
using System.Diagnostics;
77
using System.Linq;
8-
#if DOTNET5_4
8+
#if NETSTANDARD1_3
99
using System.Reflection;
1010
#endif
1111
using System.Threading.Tasks;

‎src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormFileModelBinder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Collections.Generic;
66
using System.Diagnostics;
77
using System.Linq;
8-
#if DOTNET5_4
8+
#if NETSTANDARD1_3
99
using System.Reflection;
1010
#endif
1111
using System.Threading.Tasks;

‎src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/GenericModelBinder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55
using System.Collections.Generic;
66
using System.Diagnostics;
7-
#if DOTNET5_4
7+
#if NETSTANDARD1_3
88
using System.Reflection;
99
#endif
1010
using System.Threading.Tasks;

‎src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/HeaderModelBinder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55
using System.Collections.Generic;
66
using System.Diagnostics;
7-
#if DOTNET5_4
7+
#if NETSTANDARD1_3
88
using System.Reflection;
99
#endif
1010
using System.Threading.Tasks;

‎src/Microsoft.AspNetCore.Mvc.Core/project.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"compilationOptions": {
99
"warningsAsErrors": true,
1010
"keyFile": "../../tools/Key.snk",
11-
"nowarn": [ "CS1591" ],
11+
"nowarn": [
12+
"CS1591"
13+
],
1214
"xmlDoc": true
1315
},
1416
"dependencies": {
@@ -55,11 +57,14 @@
5557
"System.Runtime": ""
5658
}
5759
},
58-
"dotnet5.4": {
59-
"imports": "portable-net451+win8",
60+
"netstandard1.3": {
61+
"imports": [
62+
"dotnet5.4",
63+
"portable-net451+win8"
64+
],
6065
"dependencies": {
6166
"System.Text.Encoding": "4.0.11-*"
6267
}
6368
}
6469
}
65-
}
70+
}

‎src/Microsoft.AspNetCore.Mvc.Cors/project.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"compilationOptions": {
99
"warningsAsErrors": true,
1010
"keyFile": "../../tools/Key.snk",
11-
"nowarn": [ "CS1591" ],
11+
"nowarn": [
12+
"CS1591"
13+
],
1214
"xmlDoc": true
1315
},
1416
"dependencies": {
@@ -17,8 +19,11 @@
1719
},
1820
"frameworks": {
1921
"net451": {},
20-
"dotnet5.4": {
21-
"imports": "portable-net451+win8"
22+
"netstandard1.3": {
23+
"imports": [
24+
"dotnet5.4",
25+
"portable-net451+win8"
26+
]
2227
}
2328
}
2429
}

‎src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsModelValidatorProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System;
55
using System.ComponentModel.DataAnnotations;
6-
#if DOTNET5_4
6+
#if NETSTANDARD1_3
77
using System.Reflection;
88
#endif
99
using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;

‎src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"compilationOptions": {
99
"warningsAsErrors": true,
1010
"keyFile": "../../tools/Key.snk",
11-
"nowarn": [ "CS1591" ],
11+
"nowarn": [
12+
"CS1591"
13+
],
1214
"xmlDoc": true
1315
},
1416
"dependencies": {
@@ -29,8 +31,11 @@
2931
"System.ComponentModel.DataAnnotations": ""
3032
}
3133
},
32-
"dotnet5.4": {
33-
"imports": "portable-net451+win8",
34+
"netstandard1.3": {
35+
"imports": [
36+
"dotnet5.4",
37+
"portable-net451+win8"
38+
],
3439
"dependencies": {
3540
"System.ComponentModel.Annotations": "4.1.0-*"
3641
}

‎src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"compilationOptions": {
99
"warningsAsErrors": true,
1010
"keyFile": "../../tools/Key.snk",
11-
"nowarn": [ "CS1591" ],
11+
"nowarn": [
12+
"CS1591"
13+
],
1214
"xmlDoc": true
1315
},
1416
"dependencies": {
@@ -21,8 +23,11 @@
2123
},
2224
"frameworks": {
2325
"net451": {},
24-
"dotnet5.4": {
25-
"imports": "portable-net451+win8"
26+
"netstandard1.3": {
27+
"imports": [
28+
"dotnet5.4",
29+
"portable-net451+win8"
30+
]
2631
}
2732
}
2833
}

‎src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"compilationOptions": {
99
"warningsAsErrors": true,
1010
"keyFile": "../../tools/Key.snk",
11-
"nowarn": [ "CS1591" ],
11+
"nowarn": [
12+
"CS1591"
13+
],
1214
"xmlDoc": true
1315
},
1416
"dependencies": {
@@ -29,8 +31,11 @@
2931
"System.Xml": ""
3032
}
3133
},
32-
"dotnet5.4": {
33-
"imports": "portable-net451+win8",
34+
"netstandard1.3": {
35+
"imports": [
36+
"dotnet5.4",
37+
"portable-net451+win8"
38+
],
3439
"dependencies": {
3540
"System.Runtime.Serialization.Xml": "4.1.0-*",
3641
"System.Xml.XmlSerializer": "4.0.11-*"

0 commit comments

Comments
 (0)