diff --git a/eRechnungWordPlugIn/Scripts/PlugInCfg.txt b/Scripts/PlugInCfg.txt similarity index 100% rename from eRechnungWordPlugIn/Scripts/PlugInCfg.txt rename to Scripts/PlugInCfg.txt diff --git a/eRechnungWordPlugIn/Scripts/ReleaseBuild.ps1 b/Scripts/ReleaseBuild.ps1 similarity index 96% rename from eRechnungWordPlugIn/Scripts/ReleaseBuild.ps1 rename to Scripts/ReleaseBuild.ps1 index c01830d..563d3c9 100644 --- a/eRechnungWordPlugIn/Scripts/ReleaseBuild.ps1 +++ b/Scripts/ReleaseBuild.ps1 @@ -159,7 +159,7 @@ Format-Xml -InputObject $xmlVersion #popd #write-host "`nVisual Studio 2015 Command Prompt variables set." -ForegroundColor Yellow -[string]$SolutionDir = "C:\GitHub\ebinterface-word-plugin\eRechnungWordPlugIn\" +[string]$SolutionDir = "C:\GitHub\ebinterface-word-plugin\" [string]$updVers = $UpdateVersionNumber.ToLower(); if("y","n","yes","no" -notcontains $updVers) { @@ -167,7 +167,7 @@ if("y","n","yes","no" -notcontains $updVers) } [string]$BuildLogDir = $SolutionDir+"Buildlog\"; [string]$eRechnung = "eRechnung" -[string]$eRechnungProject = "eRechnung\eRechnung.csproj" +[string]$eRechnungProject = "eRechnungWordPlugIn\eRechnung\eRechnung.csproj" [string]$fnVersion = $SolutionDir +"Scripts\Version.xml" if(!(Test-Path -Path $BuildLogDir)){ @@ -204,8 +204,8 @@ if(Test-Path $publishUrl) { } else { md $publishUrl } -[string]$buildDir = $SolutionDir+$eRechnung+"\bin\"+$Configuration+"\app.publish\*" -[string]$manual = $SolutionDir+"Handbuch\Anleitung.pdf" +[string]$buildDir = $SolutionDir+"\eRechnungWordPlugIn\"+$eRechnung+"\bin\"+$Configuration+"\app.publish\*" +[string]$manual = $SolutionDir+"eRechnungWordPlugin\Handbuch\Anleitung.pdf" [string]$jbArchive =$publishUrl+"jbarchive.7z" [string]$7zip = '"C:\Program Files\7-Zip\7z.exe"' [string]$arch1cmdParm= $7zip+ " a "+$jbArchive+" "+$buildDir+" "+$manual+ " -m0=BCJ2 -m1=LZMA:d25:fb255 -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3 -mx" diff --git a/eRechnungWordPlugIn/Scripts/Version.xml b/Scripts/Version.xml similarity index 86% rename from eRechnungWordPlugIn/Scripts/Version.xml rename to Scripts/Version.xml index ae6009b..dd7fcd3 100644 --- a/eRechnungWordPlugIn/Scripts/Version.xml +++ b/Scripts/Version.xml @@ -4,6 +4,6 @@ 4 3 0 - 5 + 6 \ No newline at end of file diff --git a/eRechnungWordPlugIn/Scripts/setVersion.ps1 b/Scripts/setVersion.ps1 similarity index 100% rename from eRechnungWordPlugIn/Scripts/setVersion.ps1 rename to Scripts/setVersion.ps1 diff --git a/eRechnungWordPlugIn.sln b/eRechnungWordPlugIn.sln index 929a2d0..aa2d6d4 100644 --- a/eRechnungWordPlugIn.sln +++ b/eRechnungWordPlugIn.sln @@ -53,10 +53,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ebIModelsTests", "eRechnung EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{D602502B-6A6C-4823-A399-E82411132766}" ProjectSection(SolutionItems) = preProject - eRechnungWordPlugIn\Scripts\PlugInCfg.txt = eRechnungWordPlugIn\Scripts\PlugInCfg.txt - eRechnungWordPlugIn\Scripts\ReleaseBuild.ps1 = eRechnungWordPlugIn\Scripts\ReleaseBuild.ps1 - eRechnungWordPlugIn\Scripts\setVersion.ps1 = eRechnungWordPlugIn\Scripts\setVersion.ps1 - eRechnungWordPlugIn\Scripts\Version.xml = eRechnungWordPlugIn\Scripts\Version.xml + Scripts\PlugInCfg.txt = Scripts\PlugInCfg.txt + Scripts\ReleaseBuild.ps1 = Scripts\ReleaseBuild.ps1 + Scripts\setVersion.ps1 = Scripts\setVersion.ps1 + Scripts\Version.xml = Scripts\Version.xml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Handbuch", "Handbuch", "{29392638-F0FE-42D6-BB91-ABEB04CC8E70}" @@ -288,7 +288,7 @@ Global {CA9BF7EF-850F-467B-96E6-02254BA24F60} = {B22F178E-9B52-45F8-A41E-A3D95A9005F9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - EnterpriseLibraryConfigurationToolBinariesPathV6 = packages\EnterpriseLibrary.Common.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.Logging.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.Validation.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.Validation.Integration.WinForms.6.0.1304.0\lib\NET45 SolutionGuid = {9C14C1FE-C995-4B16-B801-17627B2C35EA} + EnterpriseLibraryConfigurationToolBinariesPathV6 = packages\EnterpriseLibrary.Common.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.Logging.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.Validation.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.Validation.Integration.WinForms.6.0.1304.0\lib\NET45 EndGlobalSection EndGlobal diff --git a/eRechnungWordPlugIn/Logging/Properties/AssemblyInfo.cs b/eRechnungWordPlugIn/Logging/Properties/AssemblyInfo.cs index 1e718a9..ce497db 100644 --- a/eRechnungWordPlugIn/Logging/Properties/AssemblyInfo.cs +++ b/eRechnungWordPlugIn/Logging/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: -[assembly: AssemblyVersion("4.3.0.5")] +[assembly: AssemblyVersion("4.3.0.6")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/eRechnungWordPlugIn/eRechnung/Properties/AssemblyInfo.cs b/eRechnungWordPlugIn/eRechnung/Properties/AssemblyInfo.cs index 06870bb..2e53318 100644 --- a/eRechnungWordPlugIn/eRechnung/Properties/AssemblyInfo.cs +++ b/eRechnungWordPlugIn/eRechnung/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: -[assembly: AssemblyVersion("4.3.0.5")] +[assembly: AssemblyVersion("4.3.0.6")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/eRechnungWordPlugIn/eRechnung/eRechnung.csproj b/eRechnungWordPlugIn/eRechnung/eRechnung.csproj index 144e443..5ca7ed7 100644 --- a/eRechnungWordPlugIn/eRechnung/eRechnung.csproj +++ b/eRechnungWordPlugIn/eRechnung/eRechnung.csproj @@ -22,12 +22,12 @@ 11fadaeb-6e23-40e8-bb45-a202930c10c1 - 4.3.0.5 + 4.3.0.6 true - C:\trash\publish\Codeplex\4p3p0p5\ + C:\trash\publish\Codeplex\4p3p0p6\ de - 4.3.0.5 + 4.3.0.6 false true 7 diff --git a/eRechnungWordPlugIn/ebIModels/Services/ProductInfo.cs b/eRechnungWordPlugIn/ebIModels/Services/ProductInfo.cs index 12dc660..6c52809 100644 --- a/eRechnungWordPlugIn/ebIModels/Services/ProductInfo.cs +++ b/eRechnungWordPlugIn/ebIModels/Services/ProductInfo.cs @@ -55,6 +55,7 @@ private void GetLatestReleaseFromGitHub() DateTime restDateTime = DateTime.Now; Log.LogWrite(CallerInfo.Create(), Log.LogPriority.High, $"Abfrage für neue Release fehlgeschlagen: {releases.Exception.InnerException.Message}"); + Log.LogWrite(CallerInfo.Create(), Log.LogPriority.High, $"Github Reset: {restDateTime:G} "); _isNewReleaseAvailable = false; return; @@ -63,7 +64,7 @@ private void GetLatestReleaseFromGitHub() if (releaseItems.Any()) { latestRelease = releaseItems.OrderByDescending(p => p.CreatedAt).First(); - + Log.LogWrite(CallerInfo.Create(), Log.LogPriority.High, $"Release at GitHub: {latestRelease.TagName}"); // Release Tag auf github muss die Syntax Vn.n.n+n haben sonst geht das hier schief var latestVersion = SemanticVersion.Parse(latestRelease.TagName, ParseMode.AllowPrefix); _isNewReleaseAvailable = false; diff --git a/eRechnungWordPlugIn/ebIModels/XmlData/ProductInfo.xml b/eRechnungWordPlugIn/ebIModels/XmlData/ProductInfo.xml index d923a1c..16b3f50 100644 --- a/eRechnungWordPlugIn/ebIModels/XmlData/ProductInfo.xml +++ b/eRechnungWordPlugIn/ebIModels/XmlData/ProductInfo.xml @@ -1,10 +1,10 @@  ebInterface 4.3 Word PlugIn - 4.3.0+5 - Debug - 2018-04-11 18:03:04 + 4.3.0+6 + Release + 2018-04-12 12:18:24 Bugfix - 2018-04-11 18:03:03 - c64c8e9 + 2018-04-12 12:18:24 + 85432ff \ No newline at end of file diff --git a/eRechnungWordPlugIn/ebIModels/ebIModels.csproj b/eRechnungWordPlugIn/ebIModels/ebIModels.csproj index 1ca1d7c..ee55d4e 100644 --- a/eRechnungWordPlugIn/ebIModels/ebIModels.csproj +++ b/eRechnungWordPlugIn/ebIModels/ebIModels.csproj @@ -104,9 +104,8 @@ ..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll - - ..\packages\Octokit.0.24.0\lib\net45\Octokit.dll - True + + ..\..\packages\Octokit.0.29.0\lib\net45\Octokit.dll @@ -304,7 +303,7 @@ - Powershell "$(SolutionDir)\eRechnungWordPlugIn\Scripts\setVersion.ps1" -cfgName $(ConfigurationName) -ProductFile "$(ProjectDir)XmlData\ProductInfo.xml" -VersionFile "$(SolutionDir)\eRechnungWordPlugIn\Scripts\Version.xml" + Powershell "$(SolutionDir)Scripts\setVersion.ps1" -cfgName $(ConfigurationName) -ProductFile "$(ProjectDir)XmlData\ProductInfo.xml" -VersionFile "$(SolutionDir)Scripts\Version.xml"