Fixed an issue with .NET Framework 4.5.2 and 4.6.2 build.

ravibpatel · Aug 2, 2018 · a00a054 · a00a054
1 parent 51b0920
commit a00a054
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 64 deletions.
diff --git a/AutoUpdater.NET.sln b/AutoUpdater.NET.sln
@@ -34,20 +34,20 @@ Global
  {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Debug-NET35|Any CPU.Build.0 = Debug-NET35|Any CPU
  {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Debug-NET40|Any CPU.ActiveCfg = Debug-NET40|Any CPU
  {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Debug-NET40|Any CPU.Build.0 = Debug-NET40|Any CPU
- {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Debug-NET452|Any CPU.ActiveCfg = Debug-NET452|Any CPU
- {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Debug-NET452|Any CPU.Build.0 = Debug-NET452|Any CPU
- {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Debug-NET462|Any CPU.ActiveCfg = Debug-NET462|Any CPU
- {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Debug-NET462|Any CPU.Build.0 = Debug-NET462|Any CPU
+ {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Debug-NET452|Any CPU.ActiveCfg = Debug-NET40|Any CPU
+ {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Debug-NET452|Any CPU.Build.0 = Debug-NET40|Any CPU
+ {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Debug-NET462|Any CPU.ActiveCfg = Debug-NET40|Any CPU
+ {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Debug-NET462|Any CPU.Build.0 = Debug-NET40|Any CPU
  {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Release|Any CPU.Build.0 = Release|Any CPU
  {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Release-NET35|Any CPU.ActiveCfg = Release-NET35|Any CPU
  {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Release-NET35|Any CPU.Build.0 = Release-NET35|Any CPU
  {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Release-NET40|Any CPU.ActiveCfg = Release-NET40|Any CPU
  {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Release-NET40|Any CPU.Build.0 = Release-NET40|Any CPU
- {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Release-NET452|Any CPU.ActiveCfg = Release-NET452|Any CPU
- {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Release-NET452|Any CPU.Build.0 = Release-NET452|Any CPU
- {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Release-NET462|Any CPU.ActiveCfg = Release-NET462|Any CPU
- {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Release-NET462|Any CPU.Build.0 = Release-NET462|Any CPU
+ {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Release-NET452|Any CPU.ActiveCfg = Release-NET40|Any CPU
+ {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Release-NET452|Any CPU.Build.0 = Release-NET40|Any CPU
+ {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Release-NET462|Any CPU.ActiveCfg = Release-NET40|Any CPU
+ {FB9E7E6B-B19F-4F37-A708-2996190CEF13}.Release-NET462|Any CPU.Build.0 = Release-NET40|Any CPU
  {FD5AE762-C630-49F8-B814-FCF70E7838D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {FD5AE762-C630-49F8-B814-FCF70E7838D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {FD5AE762-C630-49F8-B814-FCF70E7838D1}.Debug-NET35|Any CPU.ActiveCfg = Debug|Any CPU

diff --git a/AutoUpdater.NET/AutoUpdater.NET.csproj b/AutoUpdater.NET/AutoUpdater.NET.csproj
@@ -60,26 +60,6 @@
  <OutputPath>build\lib\net40</OutputPath>
  <DocumentationFile>build\lib\net40\AutoUpdater.NET.XML</DocumentationFile>
  </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Debug-NET452' ">
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
- <OutputPath>bin\Debug\net452</OutputPath>
- <DocumentationFile>bin\Debug\net452\AutoUpdater.NET.XML</DocumentationFile>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Release-NET452' ">
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
- <OutputPath>build\lib\net452</OutputPath>
- <DocumentationFile>build\lib\net452\AutoUpdater.NET.XML</DocumentationFile>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Debug-NET462' ">
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
- <OutputPath>bin\Debug\net462</OutputPath>
- <DocumentationFile>bin\Debug\net462\AutoUpdater.NET.XML</DocumentationFile>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Release-NET462' ">
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
- <OutputPath>build\lib\net462</OutputPath>
- <DocumentationFile>build\lib\net462\AutoUpdater.NET.XML</DocumentationFile>
- </PropertyGroup>
  <PropertyGroup>
  <SignAssembly>true</SignAssembly>
  </PropertyGroup>

diff --git a/AutoUpdater.NET/DownloadUpdateDialog.cs b/AutoUpdater.NET/DownloadUpdateDialog.cs
@@ -178,8 +178,7 @@ private void WebClientOnDownloadFileCompleted(object sender, AsyncCompletedEvent
  };
  if (!string.IsNullOrEmpty(AutoUpdater.InstallerArgs))
  {
- var args = AutoUpdater.InstallerArgs.Split(' ');
- processStartInfo.Arguments += " " + string.Join(" ", args);
+ processStartInfo.Arguments += " " + AutoUpdater.InstallerArgs;
  }
  }
 

diff --git a/AutoUpdater.NET/Properties/AssemblyInfo.cs b/AutoUpdater.NET/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // 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.4.10.0")]
-[assembly: AssemblyFileVersion("1.4.10.0")]
+[assembly: AssemblyVersion("1.4.11.0")]
+[assembly: AssemblyFileVersion("1.4.11.0")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/AutoUpdater.NET/build/Autoupdater.NET.Official.nuspec b/AutoUpdater.NET/build/Autoupdater.NET.Official.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http:https://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
  <metadata>
  <id>Autoupdater.NET.Official</id>
- <version>1.4.10</version>
+ <version>1.4.11</version>
  <title>AutoUpdater.NET</title>
  <authors>RBSoft</authors>
  <owners>RBSoft</owners>

diff --git a/AutoUpdaterTest/Properties/AssemblyInfo.cs b/AutoUpdaterTest/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // 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.4.10.0")]
-[assembly: AssemblyFileVersion("1.4.10.0")]
+[assembly: AssemblyVersion("1.4.11.0")]
+[assembly: AssemblyFileVersion("1.4.11.0")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/ZipExtractor/Properties/AssemblyInfo.cs b/ZipExtractor/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.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.0")]
diff --git a/ZipExtractor/ZipExtractor.csproj b/ZipExtractor/ZipExtractor.csproj
@@ -66,20 +66,6 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Release-NET40' ">
  <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
  </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Debug-NET452' ">
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
- <OutputPath>bin\Debug\net452</OutputPath>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Release-NET452' ">
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Debug-NET462' ">
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
- <OutputPath>bin\Debug\net462</OutputPath>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Release-NET462' ">
- <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
- </PropertyGroup>
  <PropertyGroup>
  <SignAssembly>true</SignAssembly>
  </PropertyGroup>
@@ -137,13 +123,6 @@
  </Compile>
  <None Include="ZipExtractor.snk" />
  </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
  <ItemGroup>
  <None Include="Resources\ZipExtractor.png" />
  </ItemGroup>

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
-version: 1.4.10.{build}
+version: 1.4.11.{build}
 environment:
- my_version: 1.4.10
+ my_version: 1.4.11
  my_secret:
  secure: vbPRaZLQYpGPr4BrZZ4p6TofpSZMud+FKtlpqjgO8aA=
 skip_branch_with_pr: true
@@ -18,10 +18,6 @@ install:
 - msbuild "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.csproj" /p:Configuration=Release-NET35 /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 - msbuild "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" /p:Configuration=Release-NET40 /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 - msbuild "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.csproj" /p:Configuration=Release-NET40 /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-- msbuild "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" /p:Configuration=Release-NET452 /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-- msbuild "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.csproj" /p:Configuration=Release-NET452 /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-- msbuild "c:\projects\AutoUpdater.NET\ZipExtractor\ZipExtractor.csproj" /p:Configuration=Release-NET462 /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-- msbuild "c:\projects\AutoUpdater.NET\AutoUpdater.NET\AutoUpdater.NET.csproj" /p:Configuration=Release-NET462 /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 - nuget pack "c:\projects\AutoUpdater.NET\AutoUpdater.NET\build\Autoupdater.NET.Official.nuspec"
 - cmd: 7z a AutoUpdater.NET-%my_version%.zip %APPVEYOR_BUILD_FOLDER%\AutoUpdater.NET\build\lib\*