Skip to content

Commit 95aa36e

Browse files
jrusbatchjrusbatch
committed
Merge pull request scriptcs#34 from scriptcs/dev
Merge dev into master
2 parents a8f912a + eb3b199 commit 95aa36e

26 files changed

+979
-948
lines changed

‎.gitattributes‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Auto detect text files and perform LF normalization
2+
# http://davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
3+
* text=auto
4+
5+
# Custom for Visual Studio
6+
*.cs diff=csharp
7+
*.sln merge=union
8+
*.csproj merge=union
9+
*.vbproj merge=union
10+
*.fsproj merge=union
11+
*.dbproj merge=union
12+
13+
# Standard to msysgit
14+
*.doc diff=astextplain
15+
*.DOC diff=astextplain
16+
*.docx diff=astextplain
17+
*.DOCX diff=astextplain
18+
*.dot diff=astextplain
19+
*.DOT diff=astextplain
20+
*.pdf diff=astextplain
21+
*.PDF diff=astextplain
22+
*.rtf diff=astextplain
23+
*.RTF diff=astextplain

‎license.txt‎

Lines changed: 175 additions & 175 deletions
Large diffs are not rendered by default.

‎samples/servicestackhost/packages.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="ServiceStack" version="3.9.37" targetFramework="net45" />
4-
<package id="ServiceStack.Common" version="3.9.37" targetFramework="net45" />
5-
<package id="ServiceStack.OrmLite.SqlServer" version="3.9.37" targetFramework="net45" />
6-
<package id="ServiceStack.Redis" version="3.9.37" targetFramework="net45" />
7-
<package id="ServiceStack.Text" version="3.9.37" targetFramework="net45" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="ServiceStack" version="3.9.37" targetFramework="net45" />
4+
<package id="ServiceStack.Common" version="3.9.37" targetFramework="net45" />
5+
<package id="ServiceStack.OrmLite.SqlServer" version="3.9.37" targetFramework="net45" />
6+
<package id="ServiceStack.Redis" version="3.9.37" targetFramework="net45" />
7+
<package id="ServiceStack.Text" version="3.9.37" targetFramework="net45" />
88
</packages>

‎samples/webapihost/packages.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net45" />
4-
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net45" />
5-
<package id="Microsoft.AspNet.WebApi.SelfHost" version="4.0.20918.0" targetFramework="net45" />
6-
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
7-
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.WebApi.SelfHost" version="4.0.20918.0" targetFramework="net45" />
6+
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
7+
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
88
</packages>

‎src/.nuget/NuGet.Config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<configuration>
3-
<solution>
4-
<add key="disableSourceControlIntegration" value="true" />
5-
</solution>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<solution>
4+
<add key="disableSourceControlIntegration" value="true" />
5+
</solution>
66
</configuration>

‎src/.nuget/NuGet.targets‎

Lines changed: 150 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -1,151 +1,151 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
5-
6-
<!-- Enable the restore command to run before builds -->
7-
<RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
8-
9-
<!-- Property that enables building a package from a project -->
10-
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
11-
12-
<!-- Determines if package restore consent is required to restore packages -->
13-
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
14-
15-
<!-- Download NuGet.exe if it does not already exist -->
16-
<DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
17-
</PropertyGroup>
18-
19-
<ItemGroup Condition=" '$(PackageSources)' == '' ">
20-
<!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
21-
<!-- The official NuGet package source (https://nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
22-
<!--
23-
<PackageSource Include="https://nuget.org/api/v2/" />
24-
<PackageSource Include="https://my-nuget-source/nuget/" />
25-
-->
26-
</ItemGroup>
27-
28-
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
29-
<!-- Windows specific commands -->
30-
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
31-
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
32-
</PropertyGroup>
33-
34-
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
35-
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
36-
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
37-
<PackagesConfig>packages.config</PackagesConfig>
38-
</PropertyGroup>
39-
40-
<PropertyGroup>
41-
<!-- NuGet command -->
42-
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
43-
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
44-
45-
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
46-
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
47-
48-
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
49-
50-
<RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
51-
<!-- Commands -->
52-
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(RequireConsentSwitch) -solutionDir "$(SolutionDir) "</RestoreCommand>
53-
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
54-
55-
<!-- We need to ensure packages are restored prior to assembly resolve -->
56-
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
57-
RestorePackages;
58-
$(BuildDependsOn);
59-
</BuildDependsOn>
60-
61-
<!-- Make the build depend on restore packages -->
62-
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
63-
$(BuildDependsOn);
64-
BuildPackage;
65-
</BuildDependsOn>
66-
</PropertyGroup>
67-
68-
<Target Name="CheckPrerequisites">
69-
<!-- Raise an error if we're unable to locate nuget.exe -->
70-
<Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
71-
<SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
72-
<!--
73-
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
74-
This effectively acts as a lock that makes sure that the download operation will only happen once and all
75-
parallel builds will have to wait for it to complete.
76-
-->
77-
<MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT" />
78-
</Target>
79-
80-
<Target Name="_DownloadNuGet">
81-
<DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
82-
</Target>
83-
84-
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
85-
<Exec Command="$(RestoreCommand)"
86-
Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
87-
88-
<Exec Command="$(RestoreCommand)"
89-
LogStandardErrorAsError="true"
90-
Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
91-
</Target>
92-
93-
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
94-
<Exec Command="$(BuildCommand)"
95-
Condition=" '$(OS)' != 'Windows_NT' " />
96-
97-
<Exec Command="$(BuildCommand)"
98-
LogStandardErrorAsError="true"
99-
Condition=" '$(OS)' == 'Windows_NT' " />
100-
</Target>
101-
102-
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
103-
<ParameterGroup>
104-
<OutputFilename ParameterType="System.String" Required="true" />
105-
</ParameterGroup>
106-
<Task>
107-
<Reference Include="System.Core" />
108-
<Using Namespace="System" />
109-
<Using Namespace="System.IO" />
110-
<Using Namespace="System.Net" />
111-
<Using Namespace="Microsoft.Build.Framework" />
112-
<Using Namespace="Microsoft.Build.Utilities" />
113-
<Code Type="Fragment" Language="cs">
114-
<![CDATA[
115-
try {
116-
OutputFilename = Path.GetFullPath(OutputFilename);
117-
118-
Log.LogMessage("Downloading latest version of NuGet.exe...");
119-
WebClient webClient = new WebClient();
120-
webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
121-
122-
return true;
123-
}
124-
catch (Exception ex) {
125-
Log.LogErrorFromException(ex);
126-
return false;
127-
}
128-
]]>
129-
</Code>
130-
</Task>
131-
</UsingTask>
132-
133-
<UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
134-
<ParameterGroup>
135-
<EnvKey ParameterType="System.String" Required="true" />
136-
<EnvValue ParameterType="System.String" Required="true" />
137-
</ParameterGroup>
138-
<Task>
139-
<Using Namespace="System" />
140-
<Code Type="Fragment" Language="cs">
141-
<![CDATA[
142-
try {
143-
Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
144-
}
145-
catch {
146-
}
147-
]]>
148-
</Code>
149-
</Task>
150-
</UsingTask>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
5+
6+
<!-- Enable the restore command to run before builds -->
7+
<RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
8+
9+
<!-- Property that enables building a package from a project -->
10+
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
11+
12+
<!-- Determines if package restore consent is required to restore packages -->
13+
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
14+
15+
<!-- Download NuGet.exe if it does not already exist -->
16+
<DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
17+
</PropertyGroup>
18+
19+
<ItemGroup Condition=" '$(PackageSources)' == '' ">
20+
<!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
21+
<!-- The official NuGet package source (https://nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
22+
<!--
23+
<PackageSource Include="https://nuget.org/api/v2/" />
24+
<PackageSource Include="https://my-nuget-source/nuget/" />
25+
-->
26+
</ItemGroup>
27+
28+
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
29+
<!-- Windows specific commands -->
30+
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
31+
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
32+
</PropertyGroup>
33+
34+
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
35+
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
36+
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
37+
<PackagesConfig>packages.config</PackagesConfig>
38+
</PropertyGroup>
39+
40+
<PropertyGroup>
41+
<!-- NuGet command -->
42+
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
43+
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
44+
45+
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
46+
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
47+
48+
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
49+
50+
<RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
51+
<!-- Commands -->
52+
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(RequireConsentSwitch) -solutionDir "$(SolutionDir) "</RestoreCommand>
53+
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
54+
55+
<!-- We need to ensure packages are restored prior to assembly resolve -->
56+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
57+
RestorePackages;
58+
$(BuildDependsOn);
59+
</BuildDependsOn>
60+
61+
<!-- Make the build depend on restore packages -->
62+
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
63+
$(BuildDependsOn);
64+
BuildPackage;
65+
</BuildDependsOn>
66+
</PropertyGroup>
67+
68+
<Target Name="CheckPrerequisites">
69+
<!-- Raise an error if we're unable to locate nuget.exe -->
70+
<Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
71+
<SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
72+
<!--
73+
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
74+
This effectively acts as a lock that makes sure that the download operation will only happen once and all
75+
parallel builds will have to wait for it to complete.
76+
-->
77+
<MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT" />
78+
</Target>
79+
80+
<Target Name="_DownloadNuGet">
81+
<DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
82+
</Target>
83+
84+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
85+
<Exec Command="$(RestoreCommand)"
86+
Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
87+
88+
<Exec Command="$(RestoreCommand)"
89+
LogStandardErrorAsError="true"
90+
Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
91+
</Target>
92+
93+
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
94+
<Exec Command="$(BuildCommand)"
95+
Condition=" '$(OS)' != 'Windows_NT' " />
96+
97+
<Exec Command="$(BuildCommand)"
98+
LogStandardErrorAsError="true"
99+
Condition=" '$(OS)' == 'Windows_NT' " />
100+
</Target>
101+
102+
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
103+
<ParameterGroup>
104+
<OutputFilename ParameterType="System.String" Required="true" />
105+
</ParameterGroup>
106+
<Task>
107+
<Reference Include="System.Core" />
108+
<Using Namespace="System" />
109+
<Using Namespace="System.IO" />
110+
<Using Namespace="System.Net" />
111+
<Using Namespace="Microsoft.Build.Framework" />
112+
<Using Namespace="Microsoft.Build.Utilities" />
113+
<Code Type="Fragment" Language="cs">
114+
<![CDATA[
115+
try {
116+
OutputFilename = Path.GetFullPath(OutputFilename);
117+
118+
Log.LogMessage("Downloading latest version of NuGet.exe...");
119+
WebClient webClient = new WebClient();
120+
webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
121+
122+
return true;
123+
}
124+
catch (Exception ex) {
125+
Log.LogErrorFromException(ex);
126+
return false;
127+
}
128+
]]>
129+
</Code>
130+
</Task>
131+
</UsingTask>
132+
133+
<UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
134+
<ParameterGroup>
135+
<EnvKey ParameterType="System.String" Required="true" />
136+
<EnvValue ParameterType="System.String" Required="true" />
137+
</ParameterGroup>
138+
<Task>
139+
<Using Namespace="System" />
140+
<Code Type="Fragment" Language="cs">
141+
<![CDATA[
142+
try {
143+
Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
144+
}
145+
catch {
146+
}
147+
]]>
148+
</Code>
149+
</Task>
150+
</UsingTask>
151151
</Project>

0 commit comments

Comments
 (0)