Updated references for DotNetZip (Zip-Slip vulnerability)

DecaTec · Oct 17, 2018 · 81e7438 · 81e7438
1 parent 1a8c1c4
commit 81e7438
Show file tree

Hide file tree

Showing 19 changed files with 45 additions and 48 deletions.
diff --git a/Doc/de/Windows Server Advanced Power Managment (deutsch).docx b/Doc/de/Windows Server Advanced Power Managment (deutsch).docx
diff --git a/Doc/en/Windows Server Advanced Power Managment (englisch).docx b/Doc/en/Windows Server Advanced Power Managment (englisch).docx
diff --git a/Source/Wsapm/Wsapm.Core/Properties/AssemblyInfo.cs b/Source/Wsapm/Wsapm.Core/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.6.1.0")]
+[assembly: AssemblyFileVersion("1.6.1.0")]
diff --git a/Source/Wsapm/Wsapm.Core/VersionInformation.cs b/Source/Wsapm/Wsapm.Core/VersionInformation.cs
@@ -10,6 +10,6 @@ public static  class VersionInformation
         /// <summary>
         /// Current version.
         /// </summary>
-        public static Version Version = new Version(1, 6, 0, 0);
+        public static Version Version = new Version(1, 6, 1, 0);
     }
 }
diff --git a/Source/Wsapm/Wsapm.Core/Wsapm.Core.csproj b/Source/Wsapm/Wsapm.Core/Wsapm.Core.csproj
@@ -42,9 +42,8 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="DotNetZip, Version=1.11.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="System" />

diff --git a/Source/Wsapm/Wsapm.Core/packages.config b/Source/Wsapm/Wsapm.Core/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DotNetZip" version="1.10.1" targetFramework="net40-client" />
+  <package id="DotNetZip" version="1.11.0" targetFramework="net40-client" />
 </packages>
diff --git a/Source/Wsapm/Wsapm.Extensions/Properties/AssemblyInfo.cs b/Source/Wsapm/Wsapm.Extensions/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.6.1.0")]
+[assembly: AssemblyFileVersion("1.6.1.0")]
diff --git a/Source/Wsapm/Wsapm.PluginInstaller/Properties/AssemblyInfo.cs b/Source/Wsapm/Wsapm.PluginInstaller/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.6.1.0")]
+[assembly: AssemblyFileVersion("1.6.1.0")]
diff --git a/Source/Wsapm/Wsapm.PluginInstaller/Wsapm.PluginInstaller.csproj b/Source/Wsapm/Wsapm.PluginInstaller/Wsapm.PluginInstaller.csproj
@@ -40,9 +40,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="DotNetZip, Version=1.11.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Source/Wsapm/Wsapm.PluginInstaller/packages.config b/Source/Wsapm/Wsapm.PluginInstaller/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DotNetZip" version="1.10.1" targetFramework="net40" />
+  <package id="DotNetZip" version="1.11.0" targetFramework="net40" />
 </packages>
diff --git a/Source/Wsapm/Wsapm.Service/Properties/AssemblyInfo.cs b/Source/Wsapm/Wsapm.Service/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.6.1.0")]
+[assembly: AssemblyFileVersion("1.6.1.0")]
diff --git a/Source/Wsapm/Wsapm.Setup.Bootstrapper/Bundle.wxs b/Source/Wsapm/Wsapm.Setup.Bootstrapper/Bundle.wxs
@@ -3,7 +3,7 @@
      xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
 
   <!-- Product version. Refer to it with "$(var.ProductVersion)" -->
-  <?define ProductVersion = "1.6.0.0"?>
+  <?define ProductVersion = "1.6.1.0"?>
   <!-- Upgrade code. Refer to it with "$(var.UpgradeCode)" -->
   <!-- NEVER CHANGE THE UPGRADECODE -->
   <?define UpgradeCode = "{6A1E9768-6FEE-4282-8C16-AFA43DAC4751}"?>

diff --git a/Source/Wsapm/Wsapm.Setup/Wsapm.wxs b/Source/Wsapm/Wsapm.Setup/Wsapm.wxs
@@ -5,7 +5,7 @@
      xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension">
 
   <!-- Product version. Refer to it with "$(var.ProductVersion)" -->
-  <?define ProductVersion = "1.6.0.0"?>
+  <?define ProductVersion = "1.6.1.0"?>
   <!-- Upgrade code. Refer to it with "$(var.UpgradeCode)" -->
   <!-- NEVER CHANGE THE UPGRADECODE -->
   <?define UpgradeCode = "{8E133A46-F96C-48BC-9051-D77FDDECD32A}"?>

diff --git a/Source/Wsapm/Wsapm.Wpf.Controls/Properties/AssemblyInfo.cs b/Source/Wsapm/Wsapm.Wpf.Controls/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.6.1.0")]
+[assembly: AssemblyFileVersion("1.6.1.0")]
diff --git a/Source/Wsapm/Wsapm/Changelog/Changelog_de.txt b/Source/Wsapm/Wsapm/Changelog/Changelog_de.txt
@@ -1,4 +1,7 @@
-v1.6.0.0 (01.10.2017):
+v1.6.1 (17.10.2018):
+- Referenzen auf DotNetZip aktualisiert (Sicherheitslücke in alten DotNetZip Bibliotheken)
+
+v1.6.0 (01.10.2017):
 - Das Projekt Windows Server Advanced Power Management ist nun auf GitHub verfügbar: https://github.com/DecaTec/Wsapm
 - Windows Server Advanced Power Management ist nun Open Source
 - Links (AboutWindow) aktualisiert

diff --git a/Source/Wsapm/Wsapm/Changelog/Changelog_en.txt b/Source/Wsapm/Wsapm/Changelog/Changelog_en.txt
@@ -1,4 +1,7 @@
-v1.6.0.0 (10/01/2017):
+v1.6.1 (10/17/2018):
+- Updated references for DotNetZip (vulnerability in old DotNetZip libraries)
+
+v1.6.0 (10/01/2017):
 - The project Windows Server Advanced Power Management is now available on GitHub: https://github.com/DecaTec/Wsapm
 - Windows Server Advanced Power Management now is open source
 - Updated links in about window

diff --git a/Source/Wsapm/Wsapm/Properties/AssemblyInfo.cs b/Source/Wsapm/Wsapm/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.6.1.0")]
+[assembly: AssemblyFileVersion("1.6.1.0")]
diff --git a/Source/Wsapm/Wsapm/Wsapm.csproj b/Source/Wsapm/Wsapm/Wsapm.csproj
@@ -50,9 +50,8 @@
     <ApplicationIcon>Resources\app.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="DotNetZip, Version=1.11.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -73,29 +72,23 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="WindowsFormsIntegration" />
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.DataGrid, Version=3.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Xceed.Wpf.DataGrid, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=3.0.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=3.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.4.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Source/Wsapm/Wsapm/packages.config b/Source/Wsapm/Wsapm/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DotNetZip" version="1.10.1" targetFramework="net40-client" />
-  <package id="Extended.Wpf.Toolkit" version="3.0" targetFramework="net40-client" />
+  <package id="DotNetZip" version="1.11.0" targetFramework="net40-client" />
+  <package id="Extended.Wpf.Toolkit" version="3.4.0" targetFramework="net40-client" />
 </packages>