From 1162c7d636f7681a8eeac42d9911edf91bc20d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksander=20Sja=CC=8Afjell?= Date: Mon, 19 Nov 2018 14:23:15 +0100 Subject: [PATCH 01/10] Legger til korrekt virksomhetssertifikat og organisasjonsnummer Fjerner i samme slengen duplikater slik at det bare finnes ett sted. --- .../Api/SikkerDigitalPostKlientTests.cs | 3 +-- .../SmokeTestsHelper.cs | 3 +-- .../Utilities/DomainUtility.cs | 10 +++++++--- 3 files changed, 9 insertions(+), 7 deletions(-) mode change 100755 => 100644 Difi.SikkerDigitalPost.Klient.Tester/Api/SikkerDigitalPostKlientTests.cs mode change 100755 => 100644 Difi.SikkerDigitalPost.Klient.Tester/SmokeTestsHelper.cs diff --git a/Difi.SikkerDigitalPost.Klient.Tester/Api/SikkerDigitalPostKlientTests.cs b/Difi.SikkerDigitalPost.Klient.Tester/Api/SikkerDigitalPostKlientTests.cs old mode 100755 new mode 100644 index 46a3d038..38edea6b --- a/Difi.SikkerDigitalPost.Klient.Tester/Api/SikkerDigitalPostKlientTests.cs +++ b/Difi.SikkerDigitalPost.Klient.Tester/Api/SikkerDigitalPostKlientTests.cs @@ -28,8 +28,7 @@ public class ConstructorMethod : SikkerDigitalPostKlientTests public void Initializes_fields() { //Arrange - var difiOrgNr = "991825827"; - var databehandler = new Databehandler(new Organisasjonsnummer(difiOrgNr), DomainUtility.GetAvsenderCertificate()); + var databehandler = new Databehandler(DomainUtility.Organisasjonsnummer(), DomainUtility.GetAvsenderCertificate()); var klientkonfigurasjon = new Klientkonfigurasjon(Miljø.FunksjoneltTestmiljø); //Act diff --git a/Difi.SikkerDigitalPost.Klient.Tester/SmokeTestsHelper.cs b/Difi.SikkerDigitalPost.Klient.Tester/SmokeTestsHelper.cs old mode 100755 new mode 100644 index d340f0b7..2c7f7e2f --- a/Difi.SikkerDigitalPost.Klient.Tester/SmokeTestsHelper.cs +++ b/Difi.SikkerDigitalPost.Klient.Tester/SmokeTestsHelper.cs @@ -16,7 +16,6 @@ namespace Difi.SikkerDigitalPost.Klient.Tester internal class SmokeTestsHelper { private static readonly Organisasjonsnummer DifiOrganisasjonsnummer = new Organisasjonsnummer("991825827"); - private const string DifiThumbprint = "88bdb74fadaed87f52d2f5c11aed607deb9700ba";// "b0cb922214d11e8ce993838db4c6d04c0c0970b8"; private readonly SikkerDigitalPostKlient _klient; private Forsendelse _forsendelse; @@ -25,7 +24,7 @@ internal class SmokeTestsHelper public SmokeTestsHelper(Miljø miljø) { - _klient = new SikkerDigitalPostKlient(new Databehandler(DifiOrganisasjonsnummer, DifiThumbprint), new Klientkonfigurasjon(miljø)); + _klient = new SikkerDigitalPostKlient(new Databehandler(DomainUtility.Organisasjonsnummer(), DomainUtility.GetAvsenderCertificate()), new Klientkonfigurasjon(miljø)); } public SmokeTestsHelper Create_Digital_Forsendelse_with_multiple_documents() diff --git a/Difi.SikkerDigitalPost.Klient.Tester/Utilities/DomainUtility.cs b/Difi.SikkerDigitalPost.Klient.Tester/Utilities/DomainUtility.cs index f8ee8aad..471ff47b 100644 --- a/Difi.SikkerDigitalPost.Klient.Tester/Utilities/DomainUtility.cs +++ b/Difi.SikkerDigitalPost.Klient.Tester/Utilities/DomainUtility.cs @@ -85,8 +85,12 @@ internal static string GetMimeType(string fileName) internal static Avsender GetAvsender() { - var orgnrDifi = new Organisasjonsnummer("991825827"); - return new Avsender(orgnrDifi); + return new Avsender(Organisasjonsnummer()); + } + + internal static Organisasjonsnummer Organisasjonsnummer() + { + return new Organisasjonsnummer("988015814"); } internal static string GetPersonnummerMottaker() @@ -258,7 +262,7 @@ private static X509Certificate2 GetEternalTestCertificateMedPrivateKey() internal static X509Certificate2 GetAvsenderCertificate() { - string difiThumbprint = "88bdb74fadaed87f52d2f5c11aed607deb9700ba";//"‎b0cb922214d11e8ce993838db4c6d04c0c0970b8"; + string difiThumbprint = "4addc8e8dc962889cf52c145860a017844e6399e"; //Bring Testintegrasjon, gyldig til november 2021 return CertificateUtility.SenderCertificate(difiThumbprint, Language.Norwegian); } From 749fccd258af3bf37a3e4470db78a0f7f3d16d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksander=20Sja=CC=8Afjell?= Date: Mon, 19 Nov 2018 14:57:09 +0100 Subject: [PATCH 02/10] Bedre feilmelding for Xml-validerings-exceptions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Før ble det bare _Manifest er ikke gyldig._ Nå er det: _Manifest er ikke gyldig.The 'http://begrep.difi.no/sdp/schema_v10:tittel' element is invalid - The value 'Dette er en tittel som skal godkjennes av klientbiblioteket fordi den er veldig kort og det er bra, men naa er det langt' is invalid according to its datatype 'http://begrep.difi.no/sdp/schema_v10:Tittel' - The actual length is greater than the MaxLength value._ Hakket bedre beskrivelse. --- .../Exceptions/XmlValidationException.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 Difi.SikkerDigitalPost.Klient.Domene/Exceptions/XmlValidationException.cs diff --git a/Difi.SikkerDigitalPost.Klient.Domene/Exceptions/XmlValidationException.cs b/Difi.SikkerDigitalPost.Klient.Domene/Exceptions/XmlValidationException.cs old mode 100755 new mode 100644 index b3f2000b..e1818078 --- a/Difi.SikkerDigitalPost.Klient.Domene/Exceptions/XmlValidationException.cs +++ b/Difi.SikkerDigitalPost.Klient.Domene/Exceptions/XmlValidationException.cs @@ -7,7 +7,7 @@ namespace Difi.SikkerDigitalPost.Klient.Domene.Exceptions public class XmlValidationException : SikkerDigitalPostException { public XmlValidationException(string message, List validationMessages) - : base(message) + : base(message + validationMessages) { ValidationMessages = validationMessages; } From 09fc5a63f26933ba26360d85f8cb58275f4b180f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksander=20Sja=CC=8Afjell?= Date: Mon, 19 Nov 2018 15:05:36 +0100 Subject: [PATCH 03/10] Oppdaterer antall tillatte tegn til 256 Har testet validering manuelt og det gir feilmelding som forventet om det overstiger 256. Se tidligere commit for feilmelding som kommer. --- Difi.SikkerDigitalPost.Klient/XmlValidering/xsd/sdp-felles.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Difi.SikkerDigitalPost.Klient/XmlValidering/xsd/sdp-felles.xsd b/Difi.SikkerDigitalPost.Klient/XmlValidering/xsd/sdp-felles.xsd index 5782760b..1434c75e 100644 --- a/Difi.SikkerDigitalPost.Klient/XmlValidering/xsd/sdp-felles.xsd +++ b/Difi.SikkerDigitalPost.Klient/XmlValidering/xsd/sdp-felles.xsd @@ -93,7 +93,7 @@ - + From cf4ba951703c9ae89dc5db9f43617d3c7c77e438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksander=20Sja=CC=8Afjell?= Date: Mon, 19 Nov 2018 21:24:45 +0100 Subject: [PATCH 04/10] Oppdaterer ny kryptert versjon av virksomhetssertifikat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Med utløpsdato november 2021 --- ...re_Key_Encipherment_Data_Encipherment.p12.enc | Bin 0 -> 5872 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12.enc diff --git a/Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12.enc b/Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12.enc new file mode 100644 index 0000000000000000000000000000000000000000..8dde6cd21aad1b9b1b1b481b0cc7629581292e56 GIT binary patch literal 5872 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 G9Vr`uR)P%x literal 0 HcmV?d00001 From e69d28bb2a4af3bd0467cfc1acc965d5f4d1afc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksander=20Sja=CC=8Afjell?= Date: Fri, 30 Nov 2018 13:44:27 +0100 Subject: [PATCH 05/10] Fjerner strong name signing i fra appveyor-bygg --- appveyor.yml | 6 ------ signingkey.snk.enc | 2 -- 2 files changed, 8 deletions(-) delete mode 100755 signingkey.snk.enc diff --git a/appveyor.yml b/appveyor.yml index 5098b26c..29837873 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,8 +11,6 @@ - packages -> **\packages.config configuration: Release environment: - strong_name_signingkey_secret: - secure: bjxsFmbUwz8FwDx9d6dqR1q+kVdZ7JGbKKShVrAIRIs= virksomhetssertifikat_secret: secure: bjxsFmbUwz8FwDx9d6dqR1q+kVdZ7JGbKKShVrAIRIs= virksomhetssertifikat_pass: @@ -20,7 +18,6 @@ install: - git submodule update --init --recursive - nuget install secure-file -ExcludeVersion - - secure-file\tools\secure-file -decrypt signingkey.snk.enc -secret %strong_name_signingkey_secret% - secure-file\tools\secure-file -decrypt bring.p12.enc -secret %virksomhetssertifikat_secret% before_build: - ps: >- @@ -61,8 +58,6 @@ - packages -> **\packages.config configuration: Release environment: - strong_name_signingkey_secret: - secure: klTrmUGElJ32M1IvA5ecksVOZoUhA22ZAEVhpi5qaZY= virksomhetssertifikat_secret: secure: bjxsFmbUwz8FwDx9d6dqR1q+kVdZ7JGbKKShVrAIRIs= virksomhetssertifikat_pass: @@ -70,7 +65,6 @@ install: - git submodule update --init --recursive - nuget install secure-file -ExcludeVersion - - secure-file\tools\secure-file -decrypt signingkey.snk.enc -secret %strong_name_signingkey_secret% - secure-file\tools\secure-file -decrypt bring.p12.enc -secret %virksomhetssertifikat_secret% before_build: - ps: >- diff --git a/signingkey.snk.enc b/signingkey.snk.enc deleted file mode 100755 index 8b860f56..00000000 --- a/signingkey.snk.enc +++ /dev/null @@ -1,2 +0,0 @@ -u3\Pu`=n.F1N)m*ė|+h9qW#=slHQ gmx{|Gb,*O~κ{/6G9=,=c8L_Nʣ"iL<:KrsSN^Jgr `JIe8bu8%Q:̷VMV,sGY[!QYU#HhRHZ'aˉa1z3;`%p@[O4Wpwgn@o *Sdf<}8Ɏ- u=$B=?8ꗺ1zy(pdLcGb8*SAF@-T$Pm FʨZ;Xnr;|֥d>{-,2]vO=b -ri\]8y z\G_72{sj_^rƞ,Bj!K14!.,Ke5vKݼ`iQ7igSnqBF=>u 4˶O0Kn(~G@N~O@cߑ= vT߲C \ No newline at end of file From 313e3828cb7c884cde95f88cecaaefe7c6c8c86c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksander=20Sja=CC=8Afjell?= Date: Fri, 30 Nov 2018 13:54:04 +0100 Subject: [PATCH 06/10] Oppdaterer virksomhetssertifikat kryptert med verdi lagt i appveyor.yml --- ...Key_Encipherment_Data_Encipherment.p12.enc | Bin 5872 -> 5872 bytes appveyor.yml | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12.enc b/Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12.enc index 8dde6cd21aad1b9b1b1b481b0cc7629581292e56..4b7af545878e5d00d00b958c27b1954cceb5be48 100644 GIT binary patch literal 5872 zcmVnhpmbL z5p!IC&=P5=tgx%L%~6f3S=<9oc~E|eDHppDi*B`FcXS9GV9P1T<)OZGvRq+He2Pzg zx<_Z=sV<0zX~@-xH&U9)NAIn@vs{>}Wi}KU9+`}6@wD8aS&xOs4c=ni=R++`HWLf? z`Oee#(dQ#cB`BC0V@WA(PQ%DlrIeSJ8A%@&hLdBo;yq;?k3`Qrp>pVcc;iPzhnM{6 z_qEouthND!>G0!LYRx+nf?e+b&eM)Q#I5T{5xU8+1CIZEsi$u+&BZs@)(GXzbC5qC znkKhgnTn>9eNK)Fs&_BvnIzq-=RRyn#4m~|1Ud20PFx7K-NHn$!oq6U5V*8W6v%jE{scp>Nlia}N7C0ci%ZPey zxMhi?99l=ddDpLpT($l*>*t$a9g3wt(i>ou7HrDu=>GP2!e`*w5E4hGDg3J340 z0{ky^J{~m2*8C>BP%_H>Ui|}lL0(HC&8QAQE|aVa*poAmA#aP< zZ{_0IF6li*z1dr_8t^D@eGL|3&*uHs0R<|`&$h$`xCWVApO5bI2?y8maPen|5BxTK zMGh%lPED8r3GbtRf?me_oiB~1_UGQ0gCKT$AO}i33$XZW^q`*o-C$tns>{5*ihOK* z`9&G&$$Il-Hd3{LuJC5NDKPy0QJ*26r{i_eT~w5kuh(92VLw=eC#qC-nV1tMmM?1O z){6=~>@Q?+dS*-3E;MY@hm;rlor74Bna|&!NkI_b52KEaeI&a4Yc>F!Z;;s=o
  • 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 literal 5872 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 G9Vr`uR)P%x diff --git a/appveyor.yml b/appveyor.yml index 29837873..ea9cc2a6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,17 +11,17 @@ - packages -> **\packages.config configuration: Release environment: - virksomhetssertifikat_secret: - secure: bjxsFmbUwz8FwDx9d6dqR1q+kVdZ7JGbKKShVrAIRIs= virksomhetssertifikat_pass: - secure: 1GZYP7hef/X/3sNeNpGukg== + secure: eQknhCDP94FWkv9tOvX6LnWvdhZMPBaEDIbVTvCNi2g= + virksomhetssertifikat_secret: + secure: eQknhCDP94FWkv9tOvX6LnWvdhZMPBaEDIbVTvCNi2g= install: - git submodule update --init --recursive - nuget install secure-file -ExcludeVersion - - secure-file\tools\secure-file -decrypt bring.p12.enc -secret %virksomhetssertifikat_secret% + - secure-file\tools\secure-file -decrypt Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12.enc -secret %virksomhetssertifikat_secret% before_build: - ps: >- - .\appveyor-deploy\InstallVirksomhetssertifikat.ps1 -virksomhetssertifikat bring.p12; + .\appveyor-deploy\InstallVirksomhetssertifikat.ps1 -virksomhetssertifikat Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12; .\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"; @@ -65,10 +65,10 @@ install: - git submodule update --init --recursive - nuget install secure-file -ExcludeVersion - - secure-file\tools\secure-file -decrypt bring.p12.enc -secret %virksomhetssertifikat_secret% + - secure-file\tools\secure-file -decrypt Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12.enc -secret %virksomhetssertifikat_secret% before_build: - ps: >- - .\appveyor-deploy\InstallVirksomhetssertifikat.ps1 -virksomhetssertifikat bring.p12; + .\appveyor-deploy\InstallVirksomhetssertifikat.ps1 -virksomhetssertifikat Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12; .\appveyor-deploy\MoveSigningKey.ps1 -signingKeyPath "$env:APPVEYOR_BUILD_FOLDER\signingkey.snk" -signingKeyDestination "C:\Keys\signingkey.snk"; .\appveyor-deploy\NugetRestore.ps1; .\appveyor-deploy\BuildPreamble.ps1 From 258d2a372e8f189b39c0a21c3268ac5f8f8c97ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksander=20Sja=CC=8Afjell?= Date: Fri, 30 Nov 2018 14:04:07 +0100 Subject: [PATCH 07/10] Fjerner flytting av signingkey Den brukes ikke mer --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ea9cc2a6..a6d0cdc8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,6 @@ before_build: - ps: >- .\appveyor-deploy\InstallVirksomhetssertifikat.ps1 -virksomhetssertifikat Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12; - .\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 @@ -69,7 +68,6 @@ before_build: - ps: >- .\appveyor-deploy\InstallVirksomhetssertifikat.ps1 -virksomhetssertifikat Bring_Digital_Signature_Key_Encipherment_Data_Encipherment.p12; - .\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: From 9564f8c57c26244c078f4393145bc8f7acd7424f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksander=20Sja=CC=8Afjell?= Date: Fri, 30 Nov 2018 14:08:37 +0100 Subject: [PATCH 08/10] Kommenterer inn smoketester --- Difi.SikkerDigitalPost.Klient.Tester/SmokeTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Difi.SikkerDigitalPost.Klient.Tester/SmokeTests.cs b/Difi.SikkerDigitalPost.Klient.Tester/SmokeTests.cs index f20fb27e..26183205 100644 --- a/Difi.SikkerDigitalPost.Klient.Tester/SmokeTests.cs +++ b/Difi.SikkerDigitalPost.Klient.Tester/SmokeTests.cs @@ -15,7 +15,7 @@ public SmokeTests() _t = new SmokeTestsHelper(miljø); } - [Fact(Skip = "Skipping because it requires working certificates")] + [Fact] public void Send_digital_with_multiple_documents() { _t @@ -27,7 +27,7 @@ public void Send_digital_with_multiple_documents() .ConfirmReceipt(); } - [Fact(Skip = "Skipping because it requires working certificates")] + [Fact] public void Send_physical() { _t @@ -39,7 +39,7 @@ public void Send_physical() .ConfirmReceipt(); } - [Fact(Skip = "Skipping because it requires working certificates")] + [Fact] public void Send_on_behalf_of() { _t From b4c0889a098d6ed44e3ac8bc747ceb74bf7f79b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksander=20Sja=CC=8Afjell?= Date: Fri, 30 Nov 2018 14:26:44 +0100 Subject: [PATCH 09/10] Oppgraderer versjonsnummer --- SolutionItems/VersionInfo.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 SolutionItems/VersionInfo.cs diff --git a/SolutionItems/VersionInfo.cs b/SolutionItems/VersionInfo.cs old mode 100755 new mode 100644 index ea449ab7..66ad4b09 --- a/SolutionItems/VersionInfo.cs +++ b/SolutionItems/VersionInfo.cs @@ -1,7 +1,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.5.*")] +[assembly: AssemblyVersion("1.6.*")] #pragma warning disable CS7035 // The specified version string does not conform to the recommended format - major.minor.build.revision -[assembly: AssemblyFileVersion("1.5.*")] +[assembly: AssemblyFileVersion("1.6.*")] #pragma warning restore CS7035 // The specified version string does not conform to the recommended format - major.minor.build.revision \ No newline at end of file From 6e076764edd0b9c4ba9a818cf28f3284388ffc39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksander=20Sja=CC=8Afjell?= Date: Fri, 30 Nov 2018 14:45:25 +0100 Subject: [PATCH 10/10] =?UTF-8?q?Oppgraderer=20versjon=20p=C3=A5=20rett=20?= =?UTF-8?q?sted?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SolutionItems/SharedAssemblyInfo.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100755 => 100644 SolutionItems/SharedAssemblyInfo.cs diff --git a/SolutionItems/SharedAssemblyInfo.cs b/SolutionItems/SharedAssemblyInfo.cs old mode 100755 new mode 100644 index 1d29cdeb..94e1fda6 --- a/SolutionItems/SharedAssemblyInfo.cs +++ b/SolutionItems/SharedAssemblyInfo.cs @@ -4,8 +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("2.0.4")] -[assembly: AssemblyFileVersion("2.0.4")] -[assembly: AssemblyInformationalVersion("2.0.4")] +[assembly: AssemblyVersion("2.1.0")] +[assembly: AssemblyFileVersion("2.1.0")] +[assembly: AssemblyInformationalVersion("2.1.0")] [assembly: AssemblyCopyright(" 2015-2016 Direktoratet for forvaltning og IKT (Difi)")] [assembly: AssemblyCulture("")] \ No newline at end of file