Skip to content

Commit

Permalink
Merge pull request #78 from difi/appveyor
Browse files Browse the repository at this point in the history
Appveyor
  • Loading branch information
asjafjell authored Nov 8, 2016
2 parents 401ede3 + 304dc5b commit 8033e86
Show file tree
Hide file tree
Showing 17 changed files with 127 additions and 43 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "appveyor-deploy"]
path = appveyor-deploy
url = https://github.com/digipost/appveyor-deploy.git
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>C:\Keys\digipost.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Keys\signingkey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="ApiClientShared, Version=1.1.0.24133, Culture=neutral, PublicKeyToken=683b8efceae684a6, processorArchitecture=MSIL">
Expand Down Expand Up @@ -81,6 +81,9 @@
<Link>Properties\difi-oppslagstjeneste.pfx</Link>
</None>
<None Include="App.config" />
<None Include="C:\Keys\signingkey.snk">
<Link>signingkey.snk</Link>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
[assembly: AssemblyTitle("Difi.Oppslagstjeneste.Klient.Domene")]
[assembly: ComVisible(false)]

[assembly: InternalsVisibleTo("Difi.Oppslagstjeneste.Klient,PublicKey=00240000048000009400000006020000002400005253413100040000010001008b3388f9c416425f0145bbcf26e66b9a87c4e08b4cd41563e4bc8846df38ba4d997c5408cc77da26d79b03c39874a6af9df0aff3e7bdb3c0e53a91f6d19c50e160f5bf67986a04f0f985eca0252f557ed9ae520dd51e3107d6168d073d4ec5ada28d34e492ad9fb7af29c82309c5c0124211e679caea38d5463d2af9042dafda")]
[assembly: InternalsVisibleTo("Difi.Oppslagstjeneste.Klient,PublicKey=00240000048000009400000006020000002400005253413100040000010001008b3388f9c416425f0145bbcf26e66b9a87c4e08b4cd41563e4bc8846df38ba4d997c5408cc77da26d79b03c39874a6af9df0aff3e7bdb3c0e53a91f6d19c50e160f5bf67986a04f0f985eca0252f557ed9ae520dd51e3107d6168d073d4ec5ada28d34e492ad9fb7af29c82309c5c0124211e679caea38d5463d2af9042dafda")]
[assembly: InternalsVisibleTo("Difi.Oppslagstjeneste.Klient.Tests,PublicKey=00240000048000009400000006020000002400005253413100040000010001008b3388f9c416425f0145bbcf26e66b9a87c4e08b4cd41563e4bc8846df38ba4d997c5408cc77da26d79b03c39874a6af9df0aff3e7bdb3c0e53a91f6d19c50e160f5bf67986a04f0f985eca0252f557ed9ae520dd51e3107d6168d073d4ec5ada28d34e492ad9fb7af29c82309c5c0124211e679caea38d5463d2af9042dafda")]
[assembly: InternalsVisibleTo("Difi.Oppslagstjeneste.Klient,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c380484a67c900021f795e14e0fc9387437c87ff3072b061c838f403f9cff1e32e41175a7c10e672b4d63e14f66ce8383eb06186352c6dd521b53b2b7e747b83fa20e79da965b4482f7ae4b5dae1e9285aa5c8510bbaea3580511022bb47d06d7deac78890371638424f409a3f422114eb195e6f3f5e547a2b8af86fedb01ea7")]
[assembly: InternalsVisibleTo("Difi.Oppslagstjeneste.Klient,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c380484a67c900021f795e14e0fc9387437c87ff3072b061c838f403f9cff1e32e41175a7c10e672b4d63e14f66ce8383eb06186352c6dd521b53b2b7e747b83fa20e79da965b4482f7ae4b5dae1e9285aa5c8510bbaea3580511022bb47d06d7deac78890371638424f409a3f422114eb195e6f3f5e547a2b8af86fedb01ea7")]
[assembly: InternalsVisibleTo("Difi.Oppslagstjeneste.Klient.Tests,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c380484a67c900021f795e14e0fc9387437c87ff3072b061c838f403f9cff1e32e41175a7c10e672b4d63e14f66ce8383eb06186352c6dd521b53b2b7e747b83fa20e79da965b4482f7ae4b5dae1e9285aa5c8510bbaea3580511022bb47d06d7deac78890371638424f409a3f422114eb195e6f3f5e547a2b8af86fedb01ea7")]
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>C:\Keys\digipost.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Keys\signingkey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="ApiClientShared, Version=1.1.0.24133, Culture=neutral, PublicKeyToken=683b8efceae684a6, processorArchitecture=MSIL">
Expand Down Expand Up @@ -87,6 +87,9 @@
<EmbeddedResource Include="Certificate\Data\difi-enhetstester.p12" />
</ItemGroup>
<ItemGroup>
<None Include="C:\Keys\signingkey.snk">
<Link>signingkey.snk</Link>
</None>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
[assembly: AssemblyTitle("Difi.Oppslagstjeneste.Klient.Resources")]
[assembly: ComVisible(false)]

[assembly: InternalsVisibleTo("Difi.Oppslagstjeneste.Klient.Tests,PublicKey=00240000048000009400000006020000002400005253413100040000010001008b3388f9c416425f0145bbcf26e66b9a87c4e08b4cd41563e4bc8846df38ba4d997c5408cc77da26d79b03c39874a6af9df0aff3e7bdb3c0e53a91f6d19c50e160f5bf67986a04f0f985eca0252f557ed9ae520dd51e3107d6168d073d4ec5ada28d34e492ad9fb7af29c82309c5c0124211e679caea38d5463d2af9042dafda")]
[assembly: InternalsVisibleTo("Difi.Oppslagstjeneste.Klient.Tests,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c380484a67c900021f795e14e0fc9387437c87ff3072b061c838f403f9cff1e32e41175a7c10e672b4d63e14f66ce8383eb06186352c6dd521b53b2b7e747b83fa20e79da965b4482f7ae4b5dae1e9285aa5c8510bbaea3580511022bb47d06d7deac78890371638424f409a3f422114eb195e6f3f5e547a2b8af86fedb01ea7")]
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>C:\Keys\digipost.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Keys\signingkey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand All @@ -54,6 +54,9 @@
<Compile Include="XsdToCode\Code\oppslagstjeneste-metadata-16-02.cs" />
</ItemGroup>
<ItemGroup>
<None Include="C:\Keys\signingkey.snk">
<Link>signingkey.snk</Link>
</None>
<None Include="XsdToCode\GenerateClassesFromXsd.ps1" />
<None Include="XsdToCode\Xsd\oppslagstjeneste-metadata-16-02.xsd">
<SubType>Designer</SubType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>C:\Keys\digipost.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Keys\signingkey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="ApiClientShared, Version=1.1.0.24133, Culture=neutral, PublicKeyToken=683b8efceae684a6, processorArchitecture=MSIL">
Expand Down Expand Up @@ -159,6 +159,9 @@
<Link>App.config</Link>
<SubType>Designer</SubType>
</None>
<None Include="C:\Keys\signingkey.snk">
<Link>signingkey.snk</Link>
</None>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
Expand Down
8 changes: 4 additions & 4 deletions Difi.Oppslagstjeneste.Klient.Tester/Domene/PersonTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>C:\Keys\signingkey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Common.Logging, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
<HintPath>..\packages\Common.Logging.3.3.1\lib\net40\Common.Logging.dll</HintPath>
Expand Down Expand Up @@ -70,6 +76,9 @@
<None Include="App.config">
<SubType>Designer</SubType>
</None>
<None Include="C:\Keys\signingkey.snk">
<Link>signingkey.snk</Link>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
Expand Down
22 changes: 4 additions & 18 deletions Difi.Oppslagstjeneste.Klient/Difi.Oppslagstjeneste.Klient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<TeamCityBuild>false</TeamCityBuild>
<ProjectGuid>{13B840F4-199B-4482-B4A8-CB71AC1B0C99}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
Expand All @@ -14,9 +13,6 @@
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<PropertyGroup Condition=" '$(TEAMCITY_BUILD_PROPERTIES_FILE)' != ''">
<TeamCityBuild>true</TeamCityBuild>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
Expand All @@ -41,7 +37,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>C:\Keys\digipost.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>C:\Keys\signingkey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="ApiClientShared, Version=1.1.0.24133, Culture=neutral, PublicKeyToken=683b8efceae684a6, processorArchitecture=MSIL">
Expand Down Expand Up @@ -102,6 +98,9 @@
<None Include="..\SolutionItems\App.config">
<Link>App.config</Link>
</None>
<None Include="C:\Keys\signingkey.snk">
<Link>signingkey.snk</Link>
</None>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
Expand Down Expand Up @@ -140,17 +139,4 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<Target Name="TeamCity" AfterTargets="Build" Condition=" '$(TeamCityBuild)'=='true'">
<GetAssemblyIdentity AssemblyFiles="bin\$(ConfigurationName)\$(TargetFileName)">
<Output TaskParameter="Assemblies" ItemName="AssemblyIdentity" />
</GetAssemblyIdentity>
<Message Text="##teamcity[buildNumber '%(AssemblyIdentity.Version)']" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion Difi.Oppslagstjeneste.Klient/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
[assembly: AssemblyTitle("Difi.Oppslagstjeneste.Klient")]
[assembly: ComVisible(false)]

[assembly: InternalsVisibleTo("Difi.Oppslagstjeneste.Klient.Tests,PublicKey=00240000048000009400000006020000002400005253413100040000010001008b3388f9c416425f0145bbcf26e66b9a87c4e08b4cd41563e4bc8846df38ba4d997c5408cc77da26d79b03c39874a6af9df0aff3e7bdb3c0e53a91f6d19c50e160f5bf67986a04f0f985eca0252f557ed9ae520dd51e3107d6168d073d4ec5ada28d34e492ad9fb7af29c82309c5c0124211e679caea38d5463d2af9042dafda")]
[assembly: InternalsVisibleTo("Difi.Oppslagstjeneste.Klient.Tests,PublicKey=0024000004800000940000000602000000240000525341310004000001000100c380484a67c900021f795e14e0fc9387437c87ff3072b061c838f403f9cff1e32e41175a7c10e672b4d63e14f66ce8383eb06186352c6dd521b53b2b7e747b83fa20e79da965b4482f7ae4b5dae1e9285aa5c8510bbaea3580511022bb47d06d7deac78890371638424f409a3f422114eb195e6f3f5e547a2b8af86fedb01ea7")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
7 changes: 3 additions & 4 deletions SolutionItems/SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]
1 change: 1 addition & 0 deletions appveyor-deploy
Submodule appveyor-deploy added at bdba9d
86 changes: 80 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion difi-oppslagstjeneste-klient.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion difi-oppslagstjeneste-klient.sln
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{35CACDAF-9027-4799-AB9E-16210A7EF014}"
ProjectSection(SolutionItems) = preProject
SolutionItems\App.config = SolutionItems\App.config
C:\Keys\digipost.pfx = C:\Keys\digipost.pfx
SolutionItems\SharedAssemblyInfo.cs = SolutionItems\SharedAssemblyInfo.cs
C:\Keys\signingkey.snk = C:\Keys\signingkey.snk
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Difi.Oppslagstjeneste.Klient.Scripts", "Difi.Oppslagstjeneste.Klient.Scripts\Difi.Oppslagstjeneste.Klient.Scripts.csproj", "{2DD9A89B-E1B4-4DC4-BA46-1D58AB0B0200}"
Expand Down
Binary file added signingkey.snk.enc
Binary file not shown.

0 comments on commit 8033e86

Please sign in to comment.