Skip to content

Net45 update #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 18, 2016
Merged

Net45 update #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe70026
- Updated ServiceStack packages to 4.5 and target .NET framework v4.5
jonny-novikov Oct 18, 2016
70e0bb6
* NUnit3 renamed deprecated attributes.
jonny-novikov Oct 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# NuGet Packages Directory
packages

.vs/
bin/
obj/
.idea/
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2007-2011, Demis Bellot, ServiceStack.
Copyright (c) 2007-2016, Demis Bellot, ServiceStack.
http://www.servicestack.net
All rights reserved.

Expand Down
24 changes: 12 additions & 12 deletions src/.vs/config/applicationhost.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,95 +163,95 @@
</site>
<site name="ServiceStack.Northwind" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\ServiceStack.Northwind\ServiceStack.Northwind" />
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\ServiceStack.Northwind\ServiceStack.Northwind" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:51340:localhost" />
</bindings>
</site>
<site name="ServiceStack.Examples.Host.Web" id="3">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\ServiceStack.Examples\ServiceStack.Examples.Host.Web" />
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\ServiceStack.Examples\ServiceStack.Examples.Host.Web" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:64067:localhost" />
</bindings>
</site>
<site name="ServiceStack.Examples.Clients" id="4">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\ServiceStack.Examples\ServiceStack.Examples.Clients" />
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\ServiceStack.Examples\ServiceStack.Examples.Clients" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:51801:localhost" />
</bindings>
</site>
<site name="CustomPath40" id="5">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\StarterTemplates\CustomPath40" />
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\StarterTemplates\CustomPath45" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:37015:localhost" />
</bindings>
</site>
<site name="RootPath40" id="6">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\StarterTemplates\RootPath40" />
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\StarterTemplates\RootPath45" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:37022:localhost" />
</bindings>
</site>
<site name="ServiceStack.Hello" id="7">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\ServiceStack.Hello" />
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\ServiceStack.Hello" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:62577:localhost" />
</bindings>
</site>
<site name="RedisStackOverflow" id="8">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\RedisStackOverflow\RedisStackOverflow" />
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\RedisStackOverflow\RedisStackOverflow" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:53208:localhost" />
</bindings>
</site>
<site name="RestFiles" id="9">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\RestFiles\RestFiles" />
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\RestFiles\RestFiles" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:59436:localhost" />
</bindings>
</site>
<site name="RestIntro" id="10">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\RestIntro\RestIntro" />
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\RestIntro\RestIntro" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:5000:localhost" />
</bindings>
</site>
<site name="Backbone.Todos" id="11">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\Backbone.Todos" />
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\Backbone.Todos" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:11809:localhost" />
</bindings>
</site>
<site name="Docs" id="12">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\Docs" />
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\Docs" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:5416:localhost" />
</bindings>
</site>
<site name="ServiceStack.MovieRest" id="13">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\src\ServiceStack.Examples\src\ServiceStack.MovieRest\Web" />
<virtualDirectory path="/" physicalPath="C:\dev\ServiceStackApps\ServiceStack.Examples\src\ServiceStack.MovieRest\Web" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:55867:localhost" />
Expand Down
76 changes: 49 additions & 27 deletions src/AllExamples.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ServiceStack.Northwind", "ServiceStack.Northwind", "{206CDF5A-68B2-431A-B28D-B8F43C0697A6}"
EndProject
Expand Down Expand Up @@ -46,10 +46,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Examples.Clien
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Examples.ServiceModel", "ServiceStack.Examples\ServiceStack.Examples.ServiceModel\ServiceStack.Examples.ServiceModel.csproj", "{2B840832-3036-47D9-8F9B-560CD5C2BF90}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomPath40", "StarterTemplates\CustomPath40\CustomPath40.csproj", "{787130A2-1797-403F-BB3F-EA2AFDB14B12}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RootPath40", "StarterTemplates\RootPath40\RootPath40.csproj", "{07C66849-4022-4141-BB1E-B85B44B4FBAF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StarterTemplates.Common", "StarterTemplates\StarterTemplates.Common\StarterTemplates.Common.csproj", "{ACBF3D12-379A-41D7-87DB-C376CFCBD131}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleAppHost", "StarterTemplates\ConsoleAppHost\ConsoleAppHost.csproj", "{79950922-9EFF-44E1-993A-4EA20DEC780A}"
Expand Down Expand Up @@ -90,6 +86,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Examples.Tests
EndProject
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}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestFiles.Tests", "RestFiles\RestFiles.Tests\RestFiles.Tests.csproj", "{DAE4FFC2-B446-4020-8578-19B816FAA40A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RootPath45", "StarterTemplates\RootPath45\RootPath45.csproj", "{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{19FF9025-F307-4507-9CCB-5D08D7D975E1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomPath45", "StarterTemplates\CustomPath45\CustomPath45.csproj", "{E256695F-8607-4A79-ABA5-6FED3A400C71}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -180,26 +184,6 @@ Global
{2B840832-3036-47D9-8F9B-560CD5C2BF90}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{2B840832-3036-47D9-8F9B-560CD5C2BF90}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{2B840832-3036-47D9-8F9B-560CD5C2BF90}.Release|x86.ActiveCfg = Release|Any CPU
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Debug|Any CPU.Build.0 = Debug|Any CPU
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Debug|x86.ActiveCfg = Debug|Any CPU
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Release|Any CPU.ActiveCfg = Release|Any CPU
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Release|Any CPU.Build.0 = Release|Any CPU
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{787130A2-1797-403F-BB3F-EA2AFDB14B12}.Release|x86.ActiveCfg = Release|Any CPU
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Debug|x86.ActiveCfg = Debug|Any CPU
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Release|Any CPU.Build.0 = Release|Any CPU
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{07C66849-4022-4141-BB1E-B85B44B4FBAF}.Release|x86.ActiveCfg = Release|Any CPU
{ACBF3D12-379A-41D7-87DB-C376CFCBD131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ACBF3D12-379A-41D7-87DB-C376CFCBD131}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ACBF3D12-379A-41D7-87DB-C376CFCBD131}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -394,6 +378,42 @@ Global
{21777EAF-74FD-4D0B-947A-C602D8D3EBBA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{21777EAF-74FD-4D0B-947A-C602D8D3EBBA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{21777EAF-74FD-4D0B-947A-C602D8D3EBBA}.Release|x86.ActiveCfg = Release|Any CPU
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Debug|x86.ActiveCfg = Debug|Any CPU
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Debug|x86.Build.0 = Debug|Any CPU
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Release|Any CPU.Build.0 = Release|Any CPU
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Release|x86.ActiveCfg = Release|Any CPU
{DAE4FFC2-B446-4020-8578-19B816FAA40A}.Release|x86.Build.0 = Release|Any CPU
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Debug|x86.ActiveCfg = Debug|Any CPU
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Debug|x86.Build.0 = Debug|Any CPU
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Release|Any CPU.Build.0 = Release|Any CPU
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Release|x86.ActiveCfg = Release|Any CPU
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F}.Release|x86.Build.0 = Release|Any CPU
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Debug|x86.ActiveCfg = Debug|Any CPU
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Debug|x86.Build.0 = Debug|Any CPU
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Release|Any CPU.Build.0 = Release|Any CPU
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Release|x86.ActiveCfg = Release|Any CPU
{E256695F-8607-4A79-ABA5-6FED3A400C71}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -409,8 +429,6 @@ Global
{77363223-98F2-4724-8044-569C6485B3A9} = {2218422E-76B4-4128-ACFF-4CE824B0E0CE}
{53F87D5C-4540-4AFD-BD19-E081FD8E586B} = {2218422E-76B4-4128-ACFF-4CE824B0E0CE}
{2B840832-3036-47D9-8F9B-560CD5C2BF90} = {A42B0FAF-687B-4E2A-845B-BF3D2B5FF6BC}
{787130A2-1797-403F-BB3F-EA2AFDB14B12} = {4721A7AC-65B8-48C0-A7CC-BF4B7A2B9D02}
{07C66849-4022-4141-BB1E-B85B44B4FBAF} = {4721A7AC-65B8-48C0-A7CC-BF4B7A2B9D02}
{ACBF3D12-379A-41D7-87DB-C376CFCBD131} = {4721A7AC-65B8-48C0-A7CC-BF4B7A2B9D02}
{79950922-9EFF-44E1-993A-4EA20DEC780A} = {4721A7AC-65B8-48C0-A7CC-BF4B7A2B9D02}
{D49ABE7E-B090-4473-B80B-B2432BBF8CB5} = {4721A7AC-65B8-48C0-A7CC-BF4B7A2B9D02}
Expand All @@ -431,6 +449,10 @@ Global
{1DE83058-60D9-4637-90EF-C3E46EAA9ACC} = {A42B0FAF-687B-4E2A-845B-BF3D2B5FF6BC}
{969644BC-B209-4458-8DC1-041D7A9ADD3B} = {1DE83058-60D9-4637-90EF-C3E46EAA9ACC}
{21777EAF-74FD-4D0B-947A-C602D8D3EBBA} = {1DE83058-60D9-4637-90EF-C3E46EAA9ACC}
{DAE4FFC2-B446-4020-8578-19B816FAA40A} = {19FF9025-F307-4507-9CCB-5D08D7D975E1}
{91D8B4E8-1973-40C6-AF44-DBFEEAAF0C7F} = {4721A7AC-65B8-48C0-A7CC-BF4B7A2B9D02}
{19FF9025-F307-4507-9CCB-5D08D7D975E1} = {EBC6AB0B-D961-4E31-A2B4-09F74F102B37}
{E256695F-8607-4A79-ABA5-6FED3A400C71} = {4721A7AC-65B8-48C0-A7CC-BF4B7A2B9D02}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = ..\Client\RemoteInfoClient\RemoteInfoClient.csproj
Expand Down
Loading