Legger til appveyor-deploy som subrepo og .yml

difi · Nov 8, 2016 · 304dc5b · 304dc5b
1 parent a8aacab
commit 304dc5b
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 15 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "appveyor-deploy"]
+	path = appveyor-deploy
+	url = https://github.com/digipost/appveyor-deploy.git
diff --git a/Difi.Oppslagstjeneste.Klient.Tester/Domene/PersonTests.cs b/Difi.Oppslagstjeneste.Klient.Tester/Domene/PersonTests.cs
@@ -64,16 +64,16 @@ public void Reservation_and_status_success()
         public void Mobile_and_metadata_success()
         {
             Assert.Equal("+4740485641", _fixture.Person.Kontaktinformasjon.Mobiltelefonnummer.Nummer);
-            Assert.Equal(new DateTime(2015, 04, 14, 14, 35, 19), _fixture.Person.Kontaktinformasjon.Mobiltelefonnummer.SistOppdatert);
-            Assert.Equal(new DateTime(2015, 04, 14, 14, 35, 19), _fixture.Person.Kontaktinformasjon.Mobiltelefonnummer.SistVerifisert);
+            Assert.Equal(new DateTime(2015, 04, 14, 12, 35, 19, DateTimeKind.Utc), _fixture.Person.Kontaktinformasjon.Mobiltelefonnummer.SistOppdatert.Value.DateTime.ToUniversalTime());
+            Assert.Equal(new DateTime(2015, 04, 14, 12, 35, 19, DateTimeKind.Utc), _fixture.Person.Kontaktinformasjon.Mobiltelefonnummer.SistVerifisert.Value.DateTime.ToUniversalTime());
         }
 
         [Fact]
         public void Email_and_metadata_success()
         {
             Assert.Equal("[email protected]", _fixture.Person.Kontaktinformasjon.Epostadresse.Epost);
-            Assert.Equal(new DateTime(2015, 04, 14, 14, 35, 30), _fixture.Person.Kontaktinformasjon.Epostadresse.SistOppdatert);
-            Assert.Equal(new DateTime(2015, 04, 14, 14, 35, 30), _fixture.Person.Kontaktinformasjon.Epostadresse.SistVerifisert);
+            Assert.Equal(new DateTime(2015, 04, 14, 12, 35, 30, DateTimeKind.Utc), _fixture.Person.Kontaktinformasjon.Epostadresse.SistOppdatert.Value.DateTime.ToUniversalTime());
+            Assert.Equal(new DateTime(2015, 04, 14, 12, 35, 30, DateTimeKind.Utc), _fixture.Person.Kontaktinformasjon.Epostadresse.SistVerifisert.Value.DateTime.ToUniversalTime());
         }
 
         [Fact]

diff --git a/SolutionItems/SharedAssemblyInfo.cs b/SolutionItems/SharedAssemblyInfo.cs
@@ -4,9 +4,8 @@
 [assembly: AssemblyTrademark("Direktoratet for forvaltning og IKT (Difi)")]
 [assembly: AssemblyProduct("Difi Opppslagstjeneste Klient")]
 [assembly: AssemblyDescription("Klientbibliotek for integrasjon mot Oppslagstjenesten for kontakt og reservasjonregisteret")]
-[assembly: AssemblyVersion("5.5.0.*")]
-#pragma warning disable CS7035 // The specified version string does not conform to the recommended format - major.minor.build.revision
-[assembly: AssemblyFileVersion("5.5.0.*")]
-#pragma warning restore CS7035 // The specified version string does not conform to the recommended format - major.minor.build.revision
+[assembly: AssemblyVersion("5.6.0")]
+[assembly: AssemblyFileVersion("5.6.0")]
+[assembly: AssemblyInformationalVersion("5.6.0")]
 [assembly: AssemblyCopyright("© 2015-2016 Direktoratet for forvaltning og IKT (Difi)")]
 [assembly: AssemblyCulture("")]
diff --git a/appveyor-deploy b/appveyor-deploy
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,81 @@
-configuration: Release
+########################################################
+##               MASTER and BETA BUILD                ##
+########################################################
+- 
+  branches:
+    only:
+      - master
+      - beta
+  version: version-placeholder-{build}-{branch}
+  cache:
+    - packages -> **\packages.config
+  configuration: Release 
+  environment:
+    strong_name_key_encryption_key:
+      secure: klTrmUGElJ32M1IvA5ecksVOZoUhA22ZAEVhpi5qaZY=
+    virksomhetssertifikat_pass:
+      secure: ***REMOVED***
+    virksomhetssertifikat_encryption_key:
+      secure: ***REMOVED***
+  install:
+    - git submodule update --init --recursive
+    - nuget install secure-file -ExcludeVersion
+    - secure-file\tools\secure-file -decrypt signingkey.snk.enc -secret %strong_name_key_encryption_key%
+  before_build:
+  - ps: >-
+      .\appveyor-deploy\MoveSigningKey.ps1 -signingKeyPath "$env:APPVEYOR_BUILD_FOLDER\signingkey.snk" -signingKeyDestination "C:\Keys\signingkey.snk";
+      .\appveyor-deploy\NugetRestore.ps1;
+      .\appveyor-deploy\AssemblyInfoVersionPatcher.ps1 -assemblyInfoPath  ".\SolutionItems\SharedAssemblyInfo.cs"; 
+      .\appveyor-deploy\BuildPreamble.ps1   
+  build:
+    verbosity: minimal  
+  after_build:
+  - ps: >-
+      .\appveyor-deploy\NuspecVersionPatcher.ps1 -assembly "Difi.Oppslagstjeneste.Klient\bin\Release\Difi.Oppslagstjeneste.Klient.dll" -nuspec "difi-oppslagstjeneste-klient.nuspec";
+      nuget pack;
+  artifacts:
+    - path: '*.nupkg'
+  before_test:
+  - ps: >-
+      .\appveyor-deploy\TestPreamble.ps1
+  before_deploy:
+  - ps: >-
+      .\appveyor-deploy\DeployPreamble.ps1
+  deploy:
+    provider: NuGet
+    api_key:
+      secure: ShY/hyVGNf4W+jmwNVZDhWjqxh2jx9r5wSR6Cuq1AsVPcsxv+cYlSCwoIl0I6kpZ
+    skip_symbols: true
+    artifact: /.*\.nupkg/
 
-before_build:
-  - nuget restore
-
-build:
-  verbosity: minimal
+
+########################################################
+##                    OTHER BRANCHES                  ##
+########################################################
+
+-
+  version: version-placeholder-{build}-{branch}
+  cache:
+    - packages -> **\packages.config
+  configuration: Release 
+  environment:
+    strong_name_key_encryption_key:
+      secure: klTrmUGElJ32M1IvA5ecksVOZoUhA22ZAEVhpi5qaZY=
+    virksomhetssertifikat_pass:
+      secure: ***REMOVED***
+    virksomhetssertifikat_encryption_key:
+      secure: ***REMOVED***
+  install:
+    - git submodule update --init --recursive
+    - nuget install secure-file -ExcludeVersion
+    - secure-file\tools\secure-file -decrypt signingkey.snk.enc -secret %strong_name_key_encryption_key%    
+  before_build:
+  - ps: >-
+      .\appveyor-deploy\MoveSigningKey.ps1 -signingKeyPath "$env:APPVEYOR_BUILD_FOLDER\signingkey.snk" -signingKeyDestination "C:\Keys\signingkey.snk";
+      .\appveyor-deploy\NugetRestore.ps1;
+      .\appveyor-deploy\BuildPreamble.ps1          
+  build:
+    verbosity: minimal  
+  before_test:
+  - ps: >-
+      .\appveyor-deploy\TestPreamble.ps1
diff --git a/difi-oppslagstjeneste-klient.nuspec b/difi-oppslagstjeneste-klient.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>difi-oppslagstjeneste-klient</id>
-        <version>0.0.0.0</version>
+        <version>$version$</version>
         <authors>Direktoratet for forvaltning og IKT</authors>
         <owners>Direktoratet for forvaltning og IKT</owners>
         <projectUrl>https://github.com/difi/oppslagstjeneste-klient-dotnet/</projectUrl>

diff --git a/signingkey.snk.enc b/signingkey.snk.enc