Adding solution items

csbernath · csbernath · commit 8ac5136adb89 · 2018-04-23T15:51:34.000+02:00
diff --git a/DataCommander.Providers.OleDb/DataCommander.Providers.OleDb.csproj b/DataCommander.Providers.OleDb/DataCommander.Providers.OleDb.csproj
@@ -46,6 +46,7 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <NuGetPackageImportStamp>742b67de</NuGetPackageImportStamp>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>	
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\DataCommander\bin\Debug\</OutputPath>
diff --git a/DataCommander.Providers.Wmi/DataCommander.Providers.Wmi.csproj b/DataCommander.Providers.Wmi/DataCommander.Providers.Wmi.csproj
@@ -45,6 +45,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>	
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\DataCommander\bin\Debug\</OutputPath>
diff --git a/DataCommander.Updater/DataCommander.Updater.csproj b/DataCommander.Updater/DataCommander.Updater.csproj
@@ -11,6 +11,7 @@
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>	
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/DataCommander.sln b/DataCommander.sln
@@ -36,6 +36,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Foundation.NetFramework-4.7
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataCommander.Updater", "DataCommander.Updater\DataCommander.Updater.csproj", "{0B6B1DFC-696B-457A-A57E-A0BCBA0C463D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DBA94D33-D30A-408A-96D9-9D573604D3AA}"
+	ProjectSection(SolutionItems) = preProject
+		.gitattributes = .gitattributes
+		.gitignore = .gitignore
+		LICENSE = LICENSE
+		README.md = README.md
+		Version.txt = Version.txt
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		ClientRelease|Any CPU = ClientRelease|Any CPU
diff --git a/DataCommander/Updater.cs b/DataCommander/Updater.cs
@@ -42,13 +42,14 @@ await DeploymentApplication.DownloadUpdater(address, updaterDirectory, zipFileNa
                     DeploymentApplication.ExtractZip(zipFileName, updaterDirectory);
 
                     var updaterExeFileName = Path.Combine(updaterDirectory, "DataCommander.Updater.exe");
-                    DeploymentApplication.StartUpdater(updaterExeFileName);
+                    var applicationExeFileName = Assembly.GetEntryAssembly().Location;
+                    DeploymentApplication.StartUpdater(updaterExeFileName, applicationExeFileName);
                     _updateStarted = true;
                 }
                 else
                 {
                     var now = UniversalTime.Default.UtcNow;
-                    var when = now.Date.AddDays(1);
+                    var when = now.AddDays(1);
                     DeploymentCommandRepository.Save(ApplicationName, new CheckForUpdates {When = when});
                 }
             }
diff --git a/Foundation.NetFramework-4.7.1/Foundation.NetFramework-4.7.1.csproj b/Foundation.NetFramework-4.7.1/Foundation.NetFramework-4.7.1.csproj
@@ -11,6 +11,7 @@
     <AssemblyName>Foundation.NetFramework-4.7.1</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>	
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Foundation.NetStandard-2.0/Deployment/Application.cs b/Foundation.NetStandard-2.0/Deployment/Application.cs
@@ -56,11 +56,11 @@ public static void ExtractZip(string zipFileName, string updaterDirectory)
             File.Delete(zipFileName);
         }
 
-        public static void StartUpdater(string updaterExeFileName)
+        public static void StartUpdater(string updaterExeFileName, string applicationExeFileName)
         {
             var processStartInfo = new ProcessStartInfo();
             processStartInfo.FileName = updaterExeFileName;
-            processStartInfo.Arguments = $"{Quote(Environment.CurrentDirectory)}";
+            processStartInfo.Arguments = $"{Quote(applicationExeFileName)}";
             Process.Start(processStartInfo);
         }
 
diff --git a/Version.txt b/Version.txt
@@ -0,0 +1 @@
+﻿1.0.1

Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,14 @@ await DeploymentApplication.DownloadUpdater(address, updaterDirectory, zipFileNa`
`42`	`42`	`DeploymentApplication.ExtractZip(zipFileName, updaterDirectory);`
`43`	`43`
`44`	`44`	`var updaterExeFileName = Path.Combine(updaterDirectory, "DataCommander.Updater.exe");`
`45`		`- DeploymentApplication.StartUpdater(updaterExeFileName);`
	`45`	`+ var applicationExeFileName = Assembly.GetEntryAssembly().Location;`
	`46`	`+ DeploymentApplication.StartUpdater(updaterExeFileName, applicationExeFileName);`
`46`	`47`	`_updateStarted = true;`
`47`	`48`	`}`
`48`	`49`	`else`
`49`	`50`	`{`
`50`	`51`	`var now = UniversalTime.Default.UtcNow;`
`51`		`- var when = now.Date.AddDays(1);`
	`52`	`+ var when = now.AddDays(1);`
`52`	`53`	`DeploymentCommandRepository.Save(ApplicationName, new CheckForUpdates {When = when});`
`53`	`54`	`}`
`54`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,11 @@ public static void ExtractZip(string zipFileName, string updaterDirectory)`
`56`	`56`	`File.Delete(zipFileName);`
`57`	`57`	`}`
`58`	`58`
`59`		`- public static void StartUpdater(string updaterExeFileName)`
	`59`	`+ public static void StartUpdater(string updaterExeFileName, string applicationExeFileName)`
`60`	`60`	`{`
`61`	`61`	`var processStartInfo = new ProcessStartInfo();`
`62`	`62`	`processStartInfo.FileName = updaterExeFileName;`
`63`		`- processStartInfo.Arguments = $"{Quote(Environment.CurrentDirectory)}";`
	`63`	`+ processStartInfo.Arguments = $"{Quote(applicationExeFileName)}";`
`64`	`64`	`Process.Start(processStartInfo);`
`65`	`65`	`}`
`66`	`66`