diff --git a/.gitattributes b/.gitattributes index 7b90091e..d42ed740 100644 --- a/.gitattributes +++ b/.gitattributes @@ -41,6 +41,8 @@ *.fs text *.fsx text *.hs text +*.ps1 text +*.psm1 text *.csproj text merge=union *.vbproj text merge=union diff --git a/.gitignore b/.gitignore index 75f3a362..cd628f1a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ [Oo]bj/ [Ww]orking/ TestResults/ +AppPackages/ *.suo *.user \ No newline at end of file diff --git a/Build/build.ps1 b/Build/build.ps1 index e5e777e0..41c2802f 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -17,7 +17,7 @@ $workingDir = "$baseDir\Working" $builds = @( @{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; Constants=""; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"; Sign=$true}, - #@{Name = "Newtonsoft.Json.Metro"; TestsName = $null; Constants="NETFX_CORE"; FinalDir="Metro"; NuGetDir = "winrt45"; Framework="net-4.5"; Sign=$true}, + @{Name = "Newtonsoft.Json.Metro"; TestsName = $null; Constants="NETFX_CORE"; FinalDir="Metro"; NuGetDir = "winrt45"; Framework="net-4.5"; Sign=$true}, # unsigned SL/WP @{Name = "Newtonsoft.Json.WindowsPhone"; TestsName = $null; Constants="SILVERLIGHT;WINDOWS_PHONE"; FinalDir="WindowsPhone"; NuGetDir = "sl3-wp,sl4-windowsphone71"; Framework="net-4.0"; Sign=$false},