Skip to content

Commit 084e2e7

Browse files
committed
Fix OSX Template
1 parent d637e04 commit 084e2e7

File tree

4 files changed

+25
-21
lines changed

4 files changed

+25
-21
lines changed

src/DefaultApp/DefaultApp/DefaultApp.AppMac/DefaultApp.AppMac.csproj

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<RootNamespace>DefaultApp.AppMac</RootNamespace>
1010
<MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
1111
<AssemblyName>DefaultApp.AppMac</AssemblyName>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1213
</PropertyGroup>
1314
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1415
<DebugSymbols>true</DebugSymbols>
@@ -35,7 +36,7 @@
3536
<ErrorReport>prompt</ErrorReport>
3637
<WarningLevel>4</WarningLevel>
3738
<ConsolePause>false</ConsolePause>
38-
<LinkMode>SdkOnly</LinkMode>
39+
<LinkMode>None</LinkMode>
3940
<Profiling>false</Profiling>
4041
<UseRefCounting>true</UseRefCounting>
4142
<UseSGen>true</UseSGen>
@@ -53,30 +54,31 @@
5354
<HintPath>..\..\lib\DefaultApp.Resources.dll</HintPath>
5455
</Reference>
5556
<Reference Include="ServiceStack.Interfaces">
56-
<HintPath>..\..\packages\ServiceStack.Interfaces.4.5.12\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
57+
<HintPath>..\..\packages\ServiceStack.Interfaces.4.5.12\lib\portable-wp80+sl5+net45+win8+wpa81+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
5758
</Reference>
5859
<Reference Include="ServiceStack.Text">
59-
<HintPath>..\..\packages\ServiceStack.Text.4.5.12\lib\net40\ServiceStack.Text.dll</HintPath>
60+
<HintPath>..\..\packages\ServiceStack.Text.4.5.12\lib\net45\ServiceStack.Text.dll</HintPath>
6061
</Reference>
6162
<Reference Include="ServiceStack.Common">
62-
<HintPath>..\..\packages\ServiceStack.Common.4.5.12\lib\net40\ServiceStack.Common.dll</HintPath>
63+
<HintPath>..\..\packages\ServiceStack.Common.4.5.12\lib\net45\ServiceStack.Common.dll</HintPath>
6364
</Reference>
6465
<Reference Include="ServiceStack.Client">
65-
<HintPath>..\..\packages\ServiceStack.Client.4.5.12\lib\net40\ServiceStack.Client.dll</HintPath>
66+
<HintPath>..\..\packages\ServiceStack.Client.4.5.12\lib\net45\ServiceStack.Client.dll</HintPath>
6667
</Reference>
6768
<Reference Include="ServiceStack">
68-
<HintPath>..\..\packages\ServiceStack.4.5.12\lib\net40\ServiceStack.dll</HintPath>
69+
<HintPath>..\..\packages\ServiceStack.4.5.12\lib\net45\ServiceStack.dll</HintPath>
6970
</Reference>
7071
<Reference Include="ServiceStack.OrmLite">
7172
<HintPath>..\..\packages\ServiceStack.OrmLite.4.5.12\lib\net45\ServiceStack.OrmLite.dll</HintPath>
7273
</Reference>
7374
<Reference Include="ServiceStack.Redis">
74-
<HintPath>..\..\packages\ServiceStack.Redis.4.5.12\lib\net40\ServiceStack.Redis.dll</HintPath>
75+
<HintPath>..\..\packages\ServiceStack.Redis.4.5.12\lib\net45\ServiceStack.Redis.dll</HintPath>
7576
</Reference>
7677
<Reference Include="ServiceStack.Server">
7778
<HintPath>..\..\packages\ServiceStack.Server.4.5.12\lib\net45\ServiceStack.Server.dll</HintPath>
7879
</Reference>
79-
<Reference Include="Xamarin.Mac" />
80+
<Reference Include="Xamarin.Mac" />
81+
<Reference Include="System.Web" />
8082
</ItemGroup>
8183
<ItemGroup>
8284
<Compile Include="AppHost.cs" />
@@ -94,19 +96,19 @@
9496
<ItemGroup>
9597
<None Include="Info.plist" />
9698
<None Include="packages.config" />
97-
<None Include="platform.js" />
99+
<None Include="platform.js" />
98100
</ItemGroup>
99101
<ItemGroup>
100102
<InterfaceDefinition Include="MainMenu.xib" />
101103
<InterfaceDefinition Include="MainWindow.xib" />
102104
</ItemGroup>
103105
<ItemGroup>
104106
<ProjectReference Include="..\DefaultApp.ServiceInterface\DefaultApp.ServiceInterface.csproj">
105-
<Project>{582DFB0F-F84D-4E43-9BCA-2A5A86600B7A}</Project>
107+
<Project>{8572CFBA-0F3E-475F-B008-DEB9894B3475}</Project>
106108
<Name>DefaultApp.ServiceInterface</Name>
107109
</ProjectReference>
108110
<ProjectReference Include="..\DefaultApp.ServiceModel\DefaultApp.ServiceModel.csproj">
109-
<Project>{08BEF328-AB7D-48D3-800D-48ACC75C7914}</Project>
111+
<Project>{12C8E3F7-28C4-4DD6-B329-2C8AEFFBAD13}</Project>
110112
<Name>DefaultApp.ServiceModel</Name>
111113
</ProjectReference>
112114
</ItemGroup>

src/DefaultApp/DefaultApp/DefaultApp.AppMac/Program.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public static class Program
1515

1616
static void Main (string[] args)
1717
{
18+
System.Web.Util.HttpEncoder.Current = System.Web.Util.HttpEncoder.Default;
19+
1820
App = new AppHost();
1921
App.Init().Start("http://*:2337/");
2022

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ServiceStack" version="4.5.12" targetFramework="net45" />
4-
<package id="ServiceStack.Client" version="4.5.12" targetFramework="net45" />
5-
<package id="ServiceStack.Common" version="4.5.12" targetFramework="net45" />
6-
<package id="ServiceStack.Interfaces" version="4.5.12" targetFramework="net45" />
7-
<package id="ServiceStack.OrmLite" version="4.5.12" targetFramework="net45" />
8-
<package id="ServiceStack.Redis" version="4.5.12" targetFramework="net45" />
9-
<package id="ServiceStack.Server" version="4.5.12" targetFramework="net45" />
10-
<package id="ServiceStack.Text" version="4.5.12" targetFramework="net45" />
3+
<package id="ServiceStack" version="4.5.12" targetFramework="net452" />
4+
<package id="ServiceStack.Client" version="4.5.12" targetFramework="net452" />
5+
<package id="ServiceStack.Common" version="4.5.12" targetFramework="net452" />
6+
<package id="ServiceStack.Interfaces" version="4.5.12" targetFramework="net452" />
7+
<package id="ServiceStack.OrmLite" version="4.5.12" targetFramework="net452" />
8+
<package id="ServiceStack.Redis" version="4.5.12" targetFramework="net452" />
9+
<package id="ServiceStack.Server" version="4.5.12" targetFramework="net452" />
10+
<package id="ServiceStack.Text" version="4.5.12" targetFramework="net452" />
1111
</packages>

src/DefaultApp/DefaultApp/DefaultApp.ServiceInterface/DefaultApp.ServiceInterface.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</ItemGroup>
7373
<ItemGroup>
7474
<ProjectReference Include="..\DefaultApp.ServiceModel\DefaultApp.ServiceModel.csproj">
75-
<Project>{08bef328-ab7d-48d3-800d-48acc75c7914}</Project>
75+
<Project>{12C8E3F7-28C4-4DD6-B329-2C8AEFFBAD13}</Project>
7676
<Name>DefaultApp.ServiceModel</Name>
7777
</ProjectReference>
7878
</ItemGroup>

0 commit comments

Comments
 (0)