Skip to content

Commit 7106efb

Browse files
mythzmythz
authored
Merge pull request ServiceStack#36 from jonny-novikov/net45-update
Net45 update
2 parents 9fa29b9 + 70e0bb6 commit 7106efb

File tree

136 files changed

+3054
-18827
lines changed

Some content is hidden

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

136 files changed

+3054
-18827
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# NuGet Packages Directory
2+
packages
3+
4+
.vs/
15
bin/
26
obj/
37
.idea/

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2007-2011, Demis Bellot, ServiceStack.
1+
Copyright (c) 2007-2016, Demis Bellot, ServiceStack.
22
http://www.servicestack.net
33
All rights reserved.
44

‎src/.vs/config/applicationhost.config‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,95 +163,95 @@
163163
</site>
164164
<site name="ServiceStack.Northwind" id="2">
165165
<application path="/" applicationPool="Clr4IntegratedAppPool">
166-
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\ServiceStack.Northwind\ServiceStack.Northwind" />
166+
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\ServiceStack.Northwind\ServiceStack.Northwind" />
167167
</application>
168168
<bindings>
169169
<binding protocol="http" bindingInformation="*:51340:localhost" />
170170
</bindings>
171171
</site>
172172
<site name="ServiceStack.Examples.Host.Web" id="3">
173173
<application path="/" applicationPool="Clr4IntegratedAppPool">
174-
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\ServiceStack.Examples\ServiceStack.Examples.Host.Web" />
174+
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\ServiceStack.Examples\ServiceStack.Examples.Host.Web" />
175175
</application>
176176
<bindings>
177177
<binding protocol="http" bindingInformation="*:64067:localhost" />
178178
</bindings>
179179
</site>
180180
<site name="ServiceStack.Examples.Clients" id="4">
181181
<application path="/" applicationPool="Clr4IntegratedAppPool">
182-
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\ServiceStack.Examples\ServiceStack.Examples.Clients" />
182+
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\ServiceStack.Examples\ServiceStack.Examples.Clients" />
183183
</application>
184184
<bindings>
185185
<binding protocol="http" bindingInformation="*:51801:localhost" />
186186
</bindings>
187187
</site>
188188
<site name="CustomPath40" id="5">
189189
<application path="/" applicationPool="Clr4IntegratedAppPool">
190-
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\StarterTemplates\CustomPath40" />
190+
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\StarterTemplates\CustomPath45" />
191191
</application>
192192
<bindings>
193193
<binding protocol="http" bindingInformation="*:37015:localhost" />
194194
</bindings>
195195
</site>
196196
<site name="RootPath40" id="6">
197197
<application path="/" applicationPool="Clr4IntegratedAppPool">
198-
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\StarterTemplates\RootPath40" />
198+
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\StarterTemplates\RootPath45" />
199199
</application>
200200
<bindings>
201201
<binding protocol="http" bindingInformation="*:37022:localhost" />
202202
</bindings>
203203
</site>
204204
<site name="ServiceStack.Hello" id="7">
205205
<application path="/" applicationPool="Clr4IntegratedAppPool">
206-
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\ServiceStack.Hello" />
206+
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\ServiceStack.Hello" />
207207
</application>
208208
<bindings>
209209
<binding protocol="http" bindingInformation="*:62577:localhost" />
210210
</bindings>
211211
</site>
212212
<site name="RedisStackOverflow" id="8">
213213
<application path="/" applicationPool="Clr4IntegratedAppPool">
214-
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\RedisStackOverflow\RedisStackOverflow" />
214+
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\RedisStackOverflow\RedisStackOverflow" />
215215
</application>
216216
<bindings>
217217
<binding protocol="http" bindingInformation="*:53208:localhost" />
218218
</bindings>
219219
</site>
220220
<site name="RestFiles" id="9">
221221
<application path="/" applicationPool="Clr4IntegratedAppPool">
222-
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\RestFiles\RestFiles" />
222+
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\RestFiles\RestFiles" />
223223
</application>
224224
<bindings>
225225
<binding protocol="http" bindingInformation="*:59436:localhost" />
226226
</bindings>
227227
</site>
228228
<site name="RestIntro" id="10">
229229
<application path="/" applicationPool="Clr4IntegratedAppPool">
230-
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\RestIntro\RestIntro" />
230+
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\RestIntro\RestIntro" />
231231
</application>
232232
<bindings>
233233
<binding protocol="http" bindingInformation="*:5000:localhost" />
234234
</bindings>
235235
</site>
236236
<site name="Backbone.Todos" id="11">
237237
<application path="/" applicationPool="Clr4IntegratedAppPool">
238-
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\Backbone.Todos" />
238+
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\Backbone.Todos" />
239239
</application>
240240
<bindings>
241241
<binding protocol="http" bindingInformation="*:11809:localhost" />
242242
</bindings>
243243
</site>
244244
<site name="Docs" id="12">
245245
<application path="/" applicationPool="Clr4IntegratedAppPool">
246-
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\Docs" />
246+
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\Docs" />
247247
</application>
248248
<bindings>
249249
<binding protocol="http" bindingInformation="*:5416:localhost" />
250250
</bindings>
251251
</site>
252252
<site name="ServiceStack.MovieRest" id="13">
253253
<application path="/" applicationPool="Clr4IntegratedAppPool">
254-
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\ServiceStack.MovieRest\Web" />
254+
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\ServiceStack.MovieRest\Web" />
255255
</application>
256256
<bindings>
257257
<binding protocol="http" bindingInformation="*:55867:localhost" />

‎src/AllExamples.sln‎

Lines changed: 49 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ServiceStack.Northwind", "ServiceStack.Northwind", "{206CDF5A-68B2-431A-B28D-B8F43C0697A6}"
77
EndProject
@@ -46,10 +46,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Examples.Clien
4646
EndProject
4747
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Examples.ServiceModel", "ServiceStack.Examples\ServiceStack.Examples.ServiceModel\ServiceStack.Examples.ServiceModel.csproj", "{2B840832-3036-47D9-8F9B-560CD5C2BF90}"
4848
EndProject
49-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomPath40", "StarterTemplates\CustomPath40\CustomPath40.csproj", "{787130A2-1797-403F-BB3F-EA2AFDB14B12}"
50-
EndProject
51-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RootPath40", "StarterTemplates\RootPath40\RootPath40.csproj", "{07C66849-4022-4141-BB1E-B85B44B4FBAF}"
52-
EndProject
5349
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StarterTemplates.Common", "StarterTemplates\StarterTemplates.Common\StarterTemplates.Common.csproj", "{ACBF3D12-379A-41D7-87DB-C376CFCBD131}"
5450
EndProject
5551
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleAppHost", "StarterTemplates\ConsoleAppHost\ConsoleAppHost.csproj", "{79950922-9EFF-44E1-993A-4EA20DEC780A}"
@@ -90,6 +86,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Examples.Tests
9086
EndProject
9187
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Examples.Tests.Integration", "..\tests\ServiceStack.Examples.Tests.Integration\ServiceStack.Examples.Tests.Integration.csproj", "{21777EAF-74FD-4D0B-947A-C602D8D3EBBA}"
9288
EndProject
89+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestFiles.Tests", "RestFiles\RestFiles.Tests\RestFiles.Tests.csproj", "{DAE4FFC2-B446-4020-8578-19B816FAA40A}"
90+
EndProject
91+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RootPath45", "StarterTemplates\RootPath45\RootPath45.csproj", "{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}"
92+
EndProject
93+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{19FF9025-F307-4507-9CCB-5D08D7D975E1}"
94+
EndProject
95+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomPath45", "StarterTemplates\CustomPath45\CustomPath45.csproj", "{E256695F-8607-4A79-ABA5-6FED3A400C71}"
96+
EndProject
9397
Global
9498
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9599
Debug|Any CPU = Debug|Any CPU
@@ -180,26 +184,6 @@ Global
180184
{2B840832-3036-47D9-8F9B-560CD5C2BF90}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
181185
{2B840832-3036-47D9-8F9B-560CD5C2BF90}.Release|Mixed Platforms.Build.0 = Release|Any CPU
182186
{2B840832-3036-47D9-8F9B-560CD5C2BF90}.Release|x86.ActiveCfg = Release|Any CPU
183-
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
184-
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Debug|Any CPU.Build.0 = Debug|Any CPU
185-
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
186-
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
187-
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Debug|x86.ActiveCfg = Debug|Any CPU
188-
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Release|Any CPU.ActiveCfg = Release|Any CPU
189-
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Release|Any CPU.Build.0 = Release|Any CPU
190-
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
191-
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Release|Mixed Platforms.Build.0 = Release|Any CPU
192-
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Release|x86.ActiveCfg = Release|Any CPU
193-
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
194-
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
195-
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
196-
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
197-
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Debug|x86.ActiveCfg = Debug|Any CPU
198-
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
199-
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Release|Any CPU.Build.0 = Release|Any CPU
200-
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
201-
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
202-
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Release|x86.ActiveCfg = Release|Any CPU
203187
{ACBF3D12-379A-41D7-87DB-C376CFCBD131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
204188
{ACBF3D12-379A-41D7-87DB-C376CFCBD131}.Debug|Any CPU.Build.0 = Debug|Any CPU
205189
{ACBF3D12-379A-41D7-87DB-C376CFCBD131}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -394,6 +378,42 @@ Global
394378
{21777EAF-74FD-4D0B-947A-C602D8D3EBBA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
395379
{21777EAF-74FD-4D0B-947A-C602D8D3EBBA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
396380
{21777EAF-74FD-4D0B-947A-C602D8D3EBBA}.Release|x86.ActiveCfg = Release|Any CPU
381+
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
382+
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Debug|Any CPU.Build.0 = Debug|Any CPU
383+
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
384+
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
385+
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Debug|x86.ActiveCfg = Debug|Any CPU
386+
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Debug|x86.Build.0 = Debug|Any CPU
387+
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Release|Any CPU.ActiveCfg = Release|Any CPU
388+
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Release|Any CPU.Build.0 = Release|Any CPU
389+
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
390+
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
391+
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Release|x86.ActiveCfg = Release|Any CPU
392+
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Release|x86.Build.0 = Release|Any CPU
393+
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
394+
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
395+
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
396+
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
397+
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Debug|x86.ActiveCfg = Debug|Any CPU
398+
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Debug|x86.Build.0 = Debug|Any CPU
399+
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
400+
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Release|Any CPU.Build.0 = Release|Any CPU
401+
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
402+
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
403+
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Release|x86.ActiveCfg = Release|Any CPU
404+
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Release|x86.Build.0 = Release|Any CPU
405+
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
406+
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Debug|Any CPU.Build.0 = Debug|Any CPU
407+
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
408+
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
409+
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Debug|x86.ActiveCfg = Debug|Any CPU
410+
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Debug|x86.Build.0 = Debug|Any CPU
411+
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Release|Any CPU.ActiveCfg = Release|Any CPU
412+
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Release|Any CPU.Build.0 = Release|Any CPU
413+
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
414+
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Release|Mixed Platforms.Build.0 = Release|Any CPU
415+
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Release|x86.ActiveCfg = Release|Any CPU
416+
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Release|x86.Build.0 = Release|Any CPU
397417
EndGlobalSection
398418
GlobalSection(SolutionProperties) = preSolution
399419
HideSolutionNode = FALSE
@@ -409,8 +429,6 @@ Global
409429
{77363223-98F2-4724-8044-569C6485B3A9} = {2218422E-76B4-4128-ACFF-4CE824B0E0CE}
410430
{53F87D5C-4540-4AFD-BD19-E081FD8E586B} = {2218422E-76B4-4128-ACFF-4CE824B0E0CE}
411431
{2B840832-3036-47D9-8F9B-560CD5C2BF90} = {A42B0FAF-687B-4E2A-845B-BF3D2B5FF6BC}
412-
{787130A2-1797-403F-BB3F-EA2AFDB14B12} = {4721A7AC-65B8-48C0-A7CC-BF4B7A2B9D02}
413-
{07C66849-4022-4141-BB1E-B85B44B4FBAF} = {4721A7AC-65B8-48C0-A7CC-BF4B7A2B9D02}
414432
{ACBF3D12-379A-41D7-87DB-C376CFCBD131} = {4721A7AC-65B8-48C0-A7CC-BF4B7A2B9D02}
415433
{79950922-9EFF-44E1-993A-4EA20DEC780A} = {4721A7AC-65B8-48C0-A7CC-BF4B7A2B9D02}
416434
{D49ABE7E-B090-4473-B80B-B2432BBF8CB5} = {4721A7AC-65B8-48C0-A7CC-BF4B7A2B9D02}
@@ -431,6 +449,10 @@ Global
431449
{1DE83058-60D9-4637-90EF-C3E46EAA9ACC} = {A42B0FAF-687B-4E2A-845B-BF3D2B5FF6BC}
432450
{969644BC-B209-4458-8DC1-041D7A9ADD3B} = {1DE83058-60D9-4637-90EF-C3E46EAA9ACC}
433451
{21777EAF-74FD-4D0B-947A-C602D8D3EBBA} = {1DE83058-60D9-4637-90EF-C3E46EAA9ACC}
452+
{DAE4FFC2-B446-4020-8578-19B816FAA40A} = {19FF9025-F307-4507-9CCB-5D08D7D975E1}
453+
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F} = {4721A7AC-65B8-48C0-A7CC-BF4B7A2B9D02}
454+
{19FF9025-F307-4507-9CCB-5D08D7D975E1} = {EBC6AB0B-D961-4E31-A2B4-09F74F102B37}
455+
{E256695F-8607-4A79-ABA5-6FED3A400C71} = {4721A7AC-65B8-48C0-A7CC-BF4B7A2B9D02}
434456
EndGlobalSection
435457
GlobalSection(MonoDevelopProperties) = preSolution
436458
StartupItem = ..\Client\RemoteInfoClient\RemoteInfoClient.csproj

0 commit comments

Comments
 (0)