From dd094edb8813ad90e7bf320d2f80178ce59f84c5 Mon Sep 17 00:00:00 2001 From: Westin Miller Date: Tue, 22 Aug 2017 23:25:18 -0700 Subject: [PATCH] Using UTC time --- Jenkins/create-gen-files.ps1 | 1 - Jenkinsfile | 2 +- Torch.API/Properties/AssemblyInfoGen.tt | 6 +----- Torch.API/Torch.API.csproj | 4 ++-- Torch.API/packages.config | 1 - Torch.Client.Tests/Properties/AssemblyInfoGen.tt | 6 +----- Torch.Client.Tests/Torch.Client.Tests.csproj | 4 ++-- Torch.Client.Tests/packages.config | 1 - Torch.Client/Properties/AssemblyInfoGen.tt | 6 +----- Torch.Client/Torch.Client.csproj | 4 ++-- Torch.Client/packages.config | 1 - Torch.Server.Tests/Properties/AssemblyInfoGen.tt | 6 +----- Torch.Server.Tests/Torch.Server.Tests.csproj | 4 ++-- Torch.Server.Tests/packages.config | 1 - Torch.Server/Properties/AssemblyInfoGen.tt | 6 +----- Torch.Server/Torch.Server.csproj | 4 ++-- Torch.Server/packages.config | 1 - Torch.Tests/Properties/AssemblyInfoGen.tt | 6 +----- Torch.Tests/Torch.Tests.csproj | 4 ++-- Torch.Tests/packages.config | 1 - Torch/Properties/AssemblyInfoGen.tt | 6 +----- Torch/Torch.csproj | 6 +++--- Torch/packages.config | 1 - TransformOnBuild.targets | 16 ++++++---------- 24 files changed, 29 insertions(+), 69 deletions(-) delete mode 100644 Jenkins/create-gen-files.ps1 diff --git a/Jenkins/create-gen-files.ps1 b/Jenkins/create-gen-files.ps1 deleted file mode 100644 index dcc3524..0000000 --- a/Jenkins/create-gen-files.ps1 +++ /dev/null @@ -1 +0,0 @@ -Get-ChildItem -Recurse -Filter "*.csproj" | Select-String -Pattern '"[^"]+Gen.cs' -AllMatches | ForEach-Object {echo $null > ("{0}/../{1}" -f $_.Path, $_.Matches.Value.Substring(1))} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 33b801e..a60848d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ node { } stage('Build') { - bat 'powershell -File Jenkins/create-gen-files.ps1' + bat "\"${tool 'MSBuild'}msbuild\" Torch.sln /p:Configuration=Release /p:Platform=x64 /t:TransformOnBuild" bat "\"${tool 'MSBuild'}msbuild\" Torch.sln /p:Configuration=Release /p:Platform=x64" } diff --git a/Torch.API/Properties/AssemblyInfoGen.tt b/Torch.API/Properties/AssemblyInfoGen.tt index 9937cb7..4069a38 100644 --- a/Torch.API/Properties/AssemblyInfoGen.tt +++ b/Torch.API/Properties/AssemblyInfoGen.tt @@ -1,12 +1,8 @@ <#@ template debug="false" hostspecific="false" language="C#" #> -<#@ assembly name="System.Core" #> -<#@ import namespace="System.Linq" #> -<#@ import namespace="System.Text" #> -<#@ import namespace="System.Collections.Generic" #> <#@ output extension=".cs" #> using System.Reflection; -<# var dt = DateTime.Now; +<# var dt = DateTime.UtcNow; int major = 1; int minor = 0; int build = dt.DayOfYear; diff --git a/Torch.API/Torch.API.csproj b/Torch.API/Torch.API.csproj index f28c035..c1280ae 100644 --- a/Torch.API/Torch.API.csproj +++ b/Torch.API/Torch.API.csproj @@ -187,10 +187,10 @@ - + TextTemplatingFileGenerator AssemblyInfoGen.cs - + diff --git a/Torch.API/packages.config b/Torch.API/packages.config index 320a3b4..9d88a31 100644 --- a/Torch.API/packages.config +++ b/Torch.API/packages.config @@ -1,6 +1,5 @@  - \ No newline at end of file diff --git a/Torch.Client.Tests/Properties/AssemblyInfoGen.tt b/Torch.Client.Tests/Properties/AssemblyInfoGen.tt index 9937cb7..4069a38 100644 --- a/Torch.Client.Tests/Properties/AssemblyInfoGen.tt +++ b/Torch.Client.Tests/Properties/AssemblyInfoGen.tt @@ -1,12 +1,8 @@ <#@ template debug="false" hostspecific="false" language="C#" #> -<#@ assembly name="System.Core" #> -<#@ import namespace="System.Linq" #> -<#@ import namespace="System.Text" #> -<#@ import namespace="System.Collections.Generic" #> <#@ output extension=".cs" #> using System.Reflection; -<# var dt = DateTime.Now; +<# var dt = DateTime.UtcNow; int major = 1; int minor = 0; int build = dt.DayOfYear; diff --git a/Torch.Client.Tests/Torch.Client.Tests.csproj b/Torch.Client.Tests/Torch.Client.Tests.csproj index 7387658..0c86947 100644 --- a/Torch.Client.Tests/Torch.Client.Tests.csproj +++ b/Torch.Client.Tests/Torch.Client.Tests.csproj @@ -91,10 +91,10 @@ - + TextTemplatingFileGenerator AssemblyInfoGen.cs - + diff --git a/Torch.Client.Tests/packages.config b/Torch.Client.Tests/packages.config index 5cafc9a..30eb495 100644 --- a/Torch.Client.Tests/packages.config +++ b/Torch.Client.Tests/packages.config @@ -1,6 +1,5 @@  - diff --git a/Torch.Client/Properties/AssemblyInfoGen.tt b/Torch.Client/Properties/AssemblyInfoGen.tt index 9937cb7..4069a38 100644 --- a/Torch.Client/Properties/AssemblyInfoGen.tt +++ b/Torch.Client/Properties/AssemblyInfoGen.tt @@ -1,12 +1,8 @@ <#@ template debug="false" hostspecific="false" language="C#" #> -<#@ assembly name="System.Core" #> -<#@ import namespace="System.Linq" #> -<#@ import namespace="System.Text" #> -<#@ import namespace="System.Collections.Generic" #> <#@ output extension=".cs" #> using System.Reflection; -<# var dt = DateTime.Now; +<# var dt = DateTime.UtcNow; int major = 1; int minor = 0; int build = dt.DayOfYear; diff --git a/Torch.Client/Torch.Client.csproj b/Torch.Client/Torch.Client.csproj index 4e0a198..937b43a 100644 --- a/Torch.Client/Torch.Client.csproj +++ b/Torch.Client/Torch.Client.csproj @@ -170,10 +170,10 @@ - + TextTemplatingFileGenerator AssemblyInfoGen.cs - + diff --git a/Torch.Client/packages.config b/Torch.Client/packages.config index 320a3b4..9d88a31 100644 --- a/Torch.Client/packages.config +++ b/Torch.Client/packages.config @@ -1,6 +1,5 @@  - \ No newline at end of file diff --git a/Torch.Server.Tests/Properties/AssemblyInfoGen.tt b/Torch.Server.Tests/Properties/AssemblyInfoGen.tt index 890b974..4cb8d7e 100644 --- a/Torch.Server.Tests/Properties/AssemblyInfoGen.tt +++ b/Torch.Server.Tests/Properties/AssemblyInfoGen.tt @@ -1,12 +1,8 @@ <#@ template debug="false" hostspecific="false" language="C#" #> -<#@ assembly name="System.Core" #> -<#@ import namespace="System.Linq" #> -<#@ import namespace="System.Text" #> -<#@ import namespace="System.Collections.Generic" #> <#@ output extension=".cs" #> using System.Reflection; -<# var dt = DateTime.Now; +<# var dt = DateTime.UtcNow; int major = 1; int minor = 1; int build = dt.DayOfYear; diff --git a/Torch.Server.Tests/Torch.Server.Tests.csproj b/Torch.Server.Tests/Torch.Server.Tests.csproj index e05a24c..7ad592a 100644 --- a/Torch.Server.Tests/Torch.Server.Tests.csproj +++ b/Torch.Server.Tests/Torch.Server.Tests.csproj @@ -91,10 +91,10 @@ - + TextTemplatingFileGenerator AssemblyInfoGen.cs - + diff --git a/Torch.Server.Tests/packages.config b/Torch.Server.Tests/packages.config index 5cafc9a..30eb495 100644 --- a/Torch.Server.Tests/packages.config +++ b/Torch.Server.Tests/packages.config @@ -1,6 +1,5 @@  - diff --git a/Torch.Server/Properties/AssemblyInfoGen.tt b/Torch.Server/Properties/AssemblyInfoGen.tt index 890b974..4cb8d7e 100644 --- a/Torch.Server/Properties/AssemblyInfoGen.tt +++ b/Torch.Server/Properties/AssemblyInfoGen.tt @@ -1,12 +1,8 @@ <#@ template debug="false" hostspecific="false" language="C#" #> -<#@ assembly name="System.Core" #> -<#@ import namespace="System.Linq" #> -<#@ import namespace="System.Text" #> -<#@ import namespace="System.Collections.Generic" #> <#@ output extension=".cs" #> using System.Reflection; -<# var dt = DateTime.Now; +<# var dt = DateTime.UtcNow; int major = 1; int minor = 1; int build = dt.DayOfYear; diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj index db29197..e5d31e5 100644 --- a/Torch.Server/Torch.Server.csproj +++ b/Torch.Server/Torch.Server.csproj @@ -361,10 +361,10 @@ - + TextTemplatingFileGenerator AssemblyInfoGen.cs - + diff --git a/Torch.Server/packages.config b/Torch.Server/packages.config index d15e307..5221eb5 100644 --- a/Torch.Server/packages.config +++ b/Torch.Server/packages.config @@ -1,6 +1,5 @@  - diff --git a/Torch.Tests/Properties/AssemblyInfoGen.tt b/Torch.Tests/Properties/AssemblyInfoGen.tt index 9937cb7..4069a38 100644 --- a/Torch.Tests/Properties/AssemblyInfoGen.tt +++ b/Torch.Tests/Properties/AssemblyInfoGen.tt @@ -1,12 +1,8 @@ <#@ template debug="false" hostspecific="false" language="C#" #> -<#@ assembly name="System.Core" #> -<#@ import namespace="System.Linq" #> -<#@ import namespace="System.Text" #> -<#@ import namespace="System.Collections.Generic" #> <#@ output extension=".cs" #> using System.Reflection; -<# var dt = DateTime.Now; +<# var dt = DateTime.UtcNow; int major = 1; int minor = 0; int build = dt.DayOfYear; diff --git a/Torch.Tests/Torch.Tests.csproj b/Torch.Tests/Torch.Tests.csproj index 4b7cd19..02fad1d 100644 --- a/Torch.Tests/Torch.Tests.csproj +++ b/Torch.Tests/Torch.Tests.csproj @@ -86,10 +86,10 @@ - + TextTemplatingFileGenerator AssemblyInfoGen.cs - + diff --git a/Torch.Tests/packages.config b/Torch.Tests/packages.config index 5cafc9a..30eb495 100644 --- a/Torch.Tests/packages.config +++ b/Torch.Tests/packages.config @@ -1,6 +1,5 @@  - diff --git a/Torch/Properties/AssemblyInfoGen.tt b/Torch/Properties/AssemblyInfoGen.tt index 9937cb7..4069a38 100644 --- a/Torch/Properties/AssemblyInfoGen.tt +++ b/Torch/Properties/AssemblyInfoGen.tt @@ -1,12 +1,8 @@ <#@ template debug="false" hostspecific="false" language="C#" #> -<#@ assembly name="System.Core" #> -<#@ import namespace="System.Linq" #> -<#@ import namespace="System.Text" #> -<#@ import namespace="System.Collections.Generic" #> <#@ output extension=".cs" #> using System.Reflection; -<# var dt = DateTime.Now; +<# var dt = DateTime.UtcNow; int major = 1; int minor = 0; int build = dt.DayOfYear; diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj index f170b27..e4d6d61 100644 --- a/Torch/Torch.csproj +++ b/Torch/Torch.csproj @@ -221,14 +221,14 @@ - + TextTemplatingFileGenerator AssemblyInfoGen.cs - + - + \ No newline at end of file diff --git a/Torch/packages.config b/Torch/packages.config index a8f18d5..ec3af32 100644 --- a/Torch/packages.config +++ b/Torch/packages.config @@ -1,6 +1,5 @@  - diff --git a/TransformOnBuild.targets b/TransformOnBuild.targets index ee34371..063e4aa 100644 --- a/TransformOnBuild.targets +++ b/TransformOnBuild.targets @@ -1,13 +1,9 @@ - - $(SolutionDir)\packages\Mono.TextTransform.1.0.0\tools - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + + + + \ No newline at end of file