diff --git a/.nuget/MomentSharp.nuspec b/.nuget/MomentSharp.nuspec index 2e633bc..8ad47d5 100644 --- a/.nuget/MomentSharp.nuspec +++ b/.nuget/MomentSharp.nuspec @@ -14,8 +14,11 @@ - - - + + + + + + \ No newline at end of file diff --git a/MomentSharp.Tests/MomentSharp.Tests.csproj b/MomentSharp.Tests/MomentSharp.Tests.csproj index 42b0b6e..e6f11f1 100644 --- a/MomentSharp.Tests/MomentSharp.Tests.csproj +++ b/MomentSharp.Tests/MomentSharp.Tests.csproj @@ -25,7 +25,7 @@ true full false - bin\Debug\ + bin\Debug-Net45\ DEBUG;TRACE prompt 4 @@ -33,11 +33,31 @@ pdbonly true - bin\Release\ + bin\Release-Net45\ TRACE prompt 4 + + v4.0 + true + bin\Debug-Net40\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + v4.0 + bin\Release-Net40\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + diff --git a/MomentSharp.sln b/MomentSharp.sln index 2c4ad77..cd2c32a 100644 --- a/MomentSharp.sln +++ b/MomentSharp.sln @@ -1,38 +1,36 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MomentSharp", "MomentSharp\MomentSharp.csproj", "{7DF82747-DF0D-4969-91FF-30D5F8FEB7FD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MomentSharp.Tests", "MomentSharp.Tests\MomentSharp.Tests.csproj", "{0BCFE0D9-F655-4D1B-A8F5-9D4C3732DB10}" EndProject Global - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 3 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = https://paladincloudware.visualstudio.com/defaultcollection - SccProjectUniqueName0 = MomentSharp\\MomentSharp.csproj - SccProjectName0 = MomentSharp - SccLocalPath0 = MomentSharp - SccLocalPath1 = . - SccProjectUniqueName2 = MomentSharp.Tests\\MomentSharp.Tests.csproj - SccProjectName2 = MomentSharp.Tests - SccLocalPath2 = MomentSharp.Tests - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug-Net40|Any CPU = Debug-Net40|Any CPU Release|Any CPU = Release|Any CPU + Release-Net40|Any CPU = Release-Net40|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {7DF82747-DF0D-4969-91FF-30D5F8FEB7FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7DF82747-DF0D-4969-91FF-30D5F8FEB7FD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DF82747-DF0D-4969-91FF-30D5F8FEB7FD}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net40|Any CPU + {7DF82747-DF0D-4969-91FF-30D5F8FEB7FD}.Debug-Net40|Any CPU.Build.0 = Debug-Net40|Any CPU {7DF82747-DF0D-4969-91FF-30D5F8FEB7FD}.Release|Any CPU.ActiveCfg = Release|Any CPU {7DF82747-DF0D-4969-91FF-30D5F8FEB7FD}.Release|Any CPU.Build.0 = Release|Any CPU + {7DF82747-DF0D-4969-91FF-30D5F8FEB7FD}.Release-Net40|Any CPU.ActiveCfg = Release-Net40|Any CPU + {7DF82747-DF0D-4969-91FF-30D5F8FEB7FD}.Release-Net40|Any CPU.Build.0 = Release-Net40|Any CPU {0BCFE0D9-F655-4D1B-A8F5-9D4C3732DB10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0BCFE0D9-F655-4D1B-A8F5-9D4C3732DB10}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0BCFE0D9-F655-4D1B-A8F5-9D4C3732DB10}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net40|Any CPU + {0BCFE0D9-F655-4D1B-A8F5-9D4C3732DB10}.Debug-Net40|Any CPU.Build.0 = Debug-Net40|Any CPU {0BCFE0D9-F655-4D1B-A8F5-9D4C3732DB10}.Release|Any CPU.ActiveCfg = Release|Any CPU {0BCFE0D9-F655-4D1B-A8F5-9D4C3732DB10}.Release|Any CPU.Build.0 = Release|Any CPU + {0BCFE0D9-F655-4D1B-A8F5-9D4C3732DB10}.Release-Net40|Any CPU.ActiveCfg = Release-Net40|Any CPU + {0BCFE0D9-F655-4D1B-A8F5-9D4C3732DB10}.Release-Net40|Any CPU.Build.0 = Release-Net40|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MomentSharp/MomentSharp.csproj b/MomentSharp/MomentSharp.csproj index 00d6618..40578c0 100644 --- a/MomentSharp/MomentSharp.csproj +++ b/MomentSharp/MomentSharp.csproj @@ -20,20 +20,42 @@ true full false - bin\Debug\ + bin\Debug-Net45\ DEBUG;TRACE prompt 4 - bin\Debug\MomentSharp.xml + bin\Debug-Net45\MomentSharp.xml pdbonly true - bin\Release\ + bin\Release-Net45\ TRACE prompt 4 - bin\Release\MomentSharp.xml + bin\Release-Net45\MomentSharp.xml + + + v4.0 + true + bin\Debug-Net40\ + DEBUG;TRACE + bin\Debug-Net40\MomentSharp.xml + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + v4.0 + bin\Release-Net40\ + TRACE + bin\Release-Net40\MomentSharp.xml + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset diff --git a/MomentSharp/Properties/AssemblyInfo.cs b/MomentSharp/Properties/AssemblyInfo.cs index d09ac8e..2e6479b 100644 --- a/MomentSharp/Properties/AssemblyInfo.cs +++ b/MomentSharp/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.5634.26393")] -[assembly: AssemblyFileVersion("1.0.5634.26393")] +[assembly: AssemblyVersion("1.0.5695.38445")] +[assembly: AssemblyFileVersion("1.0.5695.38445")] diff --git a/scripts/Build.ps1 b/scripts/Build.ps1 index 7aa4ebe..7da888b 100644 --- a/scripts/Build.ps1 +++ b/scripts/Build.ps1 @@ -14,18 +14,26 @@ if (!(Test-Path $destination -PathType Container)){ New-Item $destination -ItemType Directory | Out-Null } -if (Test-Path $destination\bin -PathType Container){ - Remove-Item $destination\bin -Recurse -Force - Remove-Item $destination\tests -Recurse -Force +if (Test-Path $destination\bin-Net40 -PathType Container){ + Remove-Item $destination\bin-Net40 -Recurse -Force + Remove-Item $destination\tests-Net40 -Recurse -Force } -New-Item $destination\bin -ItemType Directory | Out-Null -New-Item $destination\tests -ItemType Directory | Out-Null +New-Item $destination\bin-Net40 -ItemType Directory | Out-Null +New-Item $destination\tests-Net40 -ItemType Directory | Out-Null if (!(Test-Path $nugetDestination -PathType Container)){ New-Item $nugetDestination -ItemType Directory | Out-Null } +if (Test-Path $destination\bin-Net45 -PathType Container){ + Remove-Item $destination\bin-Net45 -Recurse -Force + Remove-Item $destination\tests-Net45 -Recurse -Force +} + +New-Item $destination\bin-Net45 -ItemType Directory | Out-Null +New-Item $destination\tests-Net45 -ItemType Directory | Out-Null + $build = [Math]::Floor([DateTime]::UtcNow.Subtract([DateTime]::Parse("01/01/2000").Date).TotalDays) $revision = [Math]::Floor([DateTime]::UtcNow.TimeOfDay.TotalSeconds / 2) @@ -37,13 +45,19 @@ $msbuild = "C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe" Set-Location $parent -Copy-Item MomentSharp\bin\$Configuration\MomentSharp.dll $destination\bin\ -Copy-Item MomentSharp\bin\$Configuration\MomentSharp.xml $destination\bin\ -Copy-Item MomentSharp\bin\$Configuration\MomentSharp.pdb $destination\bin\ -Copy-Item MomentSharp.Tests\bin\$configuration\*.ps1 $destination\tests\ -Copy-Item MomentSharp.Tests\bin\$configuration\*.dll $destination\tests\ +Copy-Item MomentSharp\bin\$Configuration-Net45\MomentSharp.dll $destination\bin-Net45\ +Copy-Item MomentSharp\bin\$Configuration-Net45\MomentSharp.xml $destination\bin-Net45\ +Copy-Item MomentSharp\bin\$Configuration-Net45\MomentSharp.pdb $destination\bin-Net45\ +Copy-Item MomentSharp\bin\$Configuration-Net40\MomentSharp.dll $destination\bin-Net40\ +Copy-Item MomentSharp\bin\$Configuration-Net40\MomentSharp.xml $destination\bin-Net40\ +Copy-Item MomentSharp\bin\$Configuration-Net40\MomentSharp.pdb $destination\bin-Net40\ + +Copy-Item MomentSharp.Tests\bin\$configuration-Net45\*.ps1 $destination\tests-Net45\ +Copy-Item MomentSharp.Tests\bin\$configuration-Net45\*.dll $destination\tests-Net45\ +Copy-Item MomentSharp.Tests\bin\$configuration-Net40\*.ps1 $destination\tests-Net40\ +Copy-Item MomentSharp.Tests\bin\$configuration-Net40\*.dll $destination\tests-Net40\ -$versionInfo = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("$destination\bin\MomentSharp.dll") +$versionInfo = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("$destination\bin-Net45\MomentSharp.dll") $version = $versionInfo.FileVersion.ToString() Set-Location $parent\.nuget