Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #259 from ssboisen/master

Updated Silverlight 4 project so it's now able to compile
  • Loading branch information...
commit 066c9a0a1149df938aaac0e118df0f3796cf229d 2 parents 1546901 + 1e6043d
@desunit desunit authored
View
11 src/ServiceStack.Text.SL4/ServiceStack.Text.SL4.csproj
@@ -80,6 +80,9 @@
<Compile Include="..\ServiceStack.Text\Common\DeserializeDictionary.cs">
<Link>Common\DeserializeDictionary.cs</Link>
</Compile>
+ <Compile Include="..\ServiceStack.Text\Common\DeserializeKeyValuePair.cs">
+ <Link>Common\DeserializeKeyValuePair.cs</Link>
+ </Compile>
<Compile Include="..\ServiceStack.Text\Common\DeserializeListWithElements.cs">
<Link>Common\DeserializeListWithElements.cs</Link>
</Compile>
@@ -137,6 +140,9 @@
<Compile Include="..\ServiceStack.Text\Controller\PathInfo.cs">
<Link>Controller\PathInfo.cs</Link>
</Compile>
+ <Compile Include="..\ServiceStack.Text\CsvAttribute.cs">
+ <Link>CsvAttribute.cs</Link>
+ </Compile>
<Compile Include="..\ServiceStack.Text\CsvConfig.cs">
<Link>CsvConfig.cs</Link>
</Compile>
@@ -164,6 +170,9 @@
<Compile Include="..\ServiceStack.Text\JsConfig.cs">
<Link>JsConfig.cs</Link>
</Compile>
+ <Compile Include="..\ServiceStack.Text\JsConfigScope.cs">
+ <Link>JsConfigScope.cs</Link>
+ </Compile>
<Compile Include="..\ServiceStack.Text\JsonObject.cs">
<Link>JsonObject.cs</Link>
</Compile>
@@ -283,7 +292,7 @@
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
<SilverlightProjectProperties />
</FlavorProperties>
- <UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="579b3fdb-cdad-44e1-8417-885c38e49a0e" />
+ <UserProperties ProjectLinkReference="579b3fdb-cdad-44e1-8417-885c38e49a0e" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
</VisualStudio>
</ProjectExtensions>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
View
5 src/ServiceStack.Text/JsConfigScope.cs
@@ -17,7 +17,9 @@ public sealed class JsConfigScope : IDisposable
internal JsConfigScope()
{
+#if !SILVERLIGHT
Thread.BeginThreadAffinity();
+#endif
parent = head;
head = this;
}
@@ -47,8 +49,9 @@ public void Dispose()
Debug.Assert(this == head, "Disposed out of order.");
head = parent;
-
+#if !SILVERLIGHT
Thread.EndThreadAffinity();
+#endif
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.