Skip to content

Commit c9ae144

Browse files
mythzmythz
committed
merge
1 parent 4bd3edf commit c9ae144

File tree

93 files changed

+12563
-12194
lines changed

Some content is hidden

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

93 files changed

+12563
-12194
lines changed

‎.gitattributes

+1-24
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,11 @@
1313
*.png binary
1414
*.gif binary
1515

16-
*.cs text=auto diff=csharp
17-
*.vb text=auto
18-
*.c text=auto
19-
*.cpp text=auto
20-
*.cxx text=auto
21-
*.h text=auto
22-
*.hxx text=auto
23-
*.py text=auto
24-
*.rb text=auto
25-
*.java text=auto
16+
*.cs text eol=crlf diff=csharp
2617
*.html text=auto
2718
*.htm text=auto
2819
*.css text=auto
29-
*.scss text=auto
30-
*.sass text=auto
31-
*.less text=auto
3220
*.js text=auto
33-
*.lisp text=auto
34-
*.clj text=auto
35-
*.sql text=auto
36-
*.php text=auto
37-
*.lua text=auto
38-
*.m text=auto
39-
*.asm text=auto
40-
*.erl text=auto
41-
*.fs text=auto
42-
*.fsx text=auto
43-
*.hs text=auto
4421

4522
*.csproj text=auto merge=union
4623
*.vbproj text=auto merge=union

‎build/NuGetPack.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nuget pack ..\NuGet\servicestack.text.nuspec
1+
nuget pack ..\NuGet\servicestack.text.nuspec -symbols

‎src/ServiceStack.Text.MonoTouch/ServiceStack.Text.MonoTouch.sln

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual Studio 2010
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text.MonoTouch", "ServiceStack.Text.MonoTouch\ServiceStack.Text.MonoTouch.csproj", "{1137B5AC-2259-413C-A473-93721D2A7551}"
5-
EndProject
6-
Global
7-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8-
Debug|Any CPU = Debug|Any CPU
9-
Release|Any CPU = Release|Any CPU
10-
EndGlobalSection
11-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
12-
{1137B5AC-2259-413C-A473-93721D2A7551}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13-
{1137B5AC-2259-413C-A473-93721D2A7551}.Debug|Any CPU.Build.0 = Debug|Any CPU
14-
{1137B5AC-2259-413C-A473-93721D2A7551}.Release|Any CPU.ActiveCfg = Release|Any CPU
15-
{1137B5AC-2259-413C-A473-93721D2A7551}.Release|Any CPU.Build.0 = Release|Any CPU
16-
EndGlobalSection
17-
GlobalSection(MonoDevelopProperties) = preSolution
18-
StartupItem = ServiceStack.Text.MonoTouch\ServiceStack.Text.MonoTouch.csproj
19-
EndGlobalSection
20-
GlobalSection(SolutionProperties) = preSolution
21-
HideSolutionNode = FALSE
22-
EndGlobalSection
23-
EndGlobal
1+
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text.MonoTouch", "ServiceStack.Text.MonoTouch\ServiceStack.Text.MonoTouch.csproj", "{1137B5AC-2259-413C-A473-93721D2A7551}"
5+
EndProject
6+
Global
7+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8+
Debug|Any CPU = Debug|Any CPU
9+
Release|Any CPU = Release|Any CPU
10+
EndGlobalSection
11+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
12+
{1137B5AC-2259-413C-A473-93721D2A7551}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13+
{1137B5AC-2259-413C-A473-93721D2A7551}.Debug|Any CPU.Build.0 = Debug|Any CPU
14+
{1137B5AC-2259-413C-A473-93721D2A7551}.Release|Any CPU.ActiveCfg = Release|Any CPU
15+
{1137B5AC-2259-413C-A473-93721D2A7551}.Release|Any CPU.Build.0 = Release|Any CPU
16+
EndGlobalSection
17+
GlobalSection(MonoDevelopProperties) = preSolution
18+
StartupItem = ServiceStack.Text.MonoTouch\ServiceStack.Text.MonoTouch.csproj
19+
EndGlobalSection
20+
GlobalSection(SolutionProperties) = preSolution
21+
HideSolutionNode = FALSE
22+
EndGlobalSection
23+
EndGlobal

‎src/ServiceStack.Text.WP/Properties/AssemblyInfo.cs

+37-37
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
using System.Reflection;
2-
using System.Runtime.CompilerServices;
3-
using System.Runtime.InteropServices;
4-
using System.Resources;
5-
6-
// General Information about an assembly is controlled through the following
7-
// set of attributes. Change these attribute values to modify the information
8-
// associated with an assembly.
9-
[assembly: AssemblyTitle("ServiceStack.Text.WP")]
10-
[assembly: AssemblyDescription("")]
11-
[assembly: AssemblyConfiguration("")]
12-
[assembly: AssemblyCompany("")]
13-
[assembly: AssemblyProduct("ServiceStack.Text.WP")]
14-
[assembly: AssemblyCopyright("Copyright © 2012")]
15-
[assembly: AssemblyTrademark("")]
16-
[assembly: AssemblyCulture("")]
17-
18-
// Setting ComVisible to false makes the types in this assembly not visible
19-
// to COM components. If you need to access a type in this assembly from
20-
// COM, set the ComVisible attribute to true on that type.
21-
[assembly: ComVisible(false)]
22-
23-
// The following GUID is for the ID of the typelib if this project is exposed to COM
24-
[assembly: Guid("8ca3569c-1483-4469-aacd-2994c5248974")]
25-
26-
// Version information for an assembly consists of the following four values:
27-
//
28-
// Major Version
29-
// Minor Version
30-
// Build Number
31-
// Revision
32-
//
33-
// You can specify all the values or you can default the Revision and Build Numbers
34-
// by using the '*' as shown below:
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
37-
[assembly: NeutralResourcesLanguageAttribute("en-US")]
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
using System.Resources;
5+
6+
// General Information about an assembly is controlled through the following
7+
// set of attributes. Change these attribute values to modify the information
8+
// associated with an assembly.
9+
[assembly: AssemblyTitle("ServiceStack.Text.WP")]
10+
[assembly: AssemblyDescription("")]
11+
[assembly: AssemblyConfiguration("")]
12+
[assembly: AssemblyCompany("")]
13+
[assembly: AssemblyProduct("ServiceStack.Text.WP")]
14+
[assembly: AssemblyCopyright("Copyright © 2012")]
15+
[assembly: AssemblyTrademark("")]
16+
[assembly: AssemblyCulture("")]
17+
18+
// Setting ComVisible to false makes the types in this assembly not visible
19+
// to COM components. If you need to access a type in this assembly from
20+
// COM, set the ComVisible attribute to true on that type.
21+
[assembly: ComVisible(false)]
22+
23+
// The following GUID is for the ID of the typelib if this project is exposed to COM
24+
[assembly: Guid("8ca3569c-1483-4469-aacd-2994c5248974")]
25+
26+
// Version information for an assembly consists of the following four values:
27+
//
28+
// Major Version
29+
// Minor Version
30+
// Build Number
31+
// Revision
32+
//
33+
// You can specify all the values or you can default the Revision and Build Numbers
34+
// by using the '*' as shown below:
35+
[assembly: AssemblyVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]
37+
[assembly: NeutralResourcesLanguageAttribute("en-US")]

0 commit comments

Comments
 (0)