diff --git a/ATXTray/Properties/Resources.resx b/ATXTray/Properties/Resources.resx
index 719fb31fbd77075d95b9d67df6ceffaa2e4e9704..d6a0af53dafe6e325445385d04e904e89a2c64b7 100644
--- a/ATXTray/Properties/Resources.resx
+++ b/ATXTray/Properties/Resources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@@ -119,10 +119,10 @@
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="BuildCommit" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\BuildCommit.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <value>..\..\Resources\BuildCommit.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
<data name="BuildDate" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\BuildDate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+ <value>..\..\Resources\BuildDate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
<data name="IconDefault" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\IconDefault.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
diff --git a/ATxService/ATxService.csproj b/ATxService/ATxService.csproj
index 808564988b32d8f65cbb994efb157ea2d97d75cc..41c55adf6411d197c06356f242f99cc0a40cc2dc 100644
--- a/ATxService/ATxService.csproj
+++ b/ATxService/ATxService.csproj
@@ -144,10 +144,6 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
- <None Include="Resources\BuildDate.txt" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\BuildCommit.txt" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ATxCommon\ATxCommon.csproj">
@@ -156,6 +152,12 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
+ <None Include="..\Resources\BuildCommit.txt">
+ <Link>Resources\BuildCommit.txt</Link>
+ </None>
+ <None Include="..\Resources\BuildDate.txt">
+ <Link>Resources\BuildDate.txt</Link>
+ </None>
<Content Include="..\Resources\Mail-Templates\DiskSpace-Low.txt">
<Link>Mail-Templates\DiskSpace-Low.txt</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -171,7 +173,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PreBuildEvent>PowerShell -NoProfile -ExecutionPolicy RemoteSigned $(SolutionDir)\Scripts\Prepare-Build.ps1 -ProjectDir $(ProjectDir) -ConfigurationName $(ConfigurationName)</PreBuildEvent>
+ <PreBuildEvent>PowerShell -NoProfile -ExecutionPolicy RemoteSigned $(SolutionDir)Scripts\Prepare-Build.ps1 -SolutionDir $(SolutionDir) -ConfigurationName $(ConfigurationName)</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>
diff --git a/ATxService/Properties/Resources.Designer.cs b/ATxService/Properties/Resources.Designer.cs
index 26be70d215a1b4caeef7b4d575ef0e84b8d29e07..f51568b5ae15eba2a07ca9344163c3feca7fe034 100644
--- a/ATxService/Properties/Resources.Designer.cs
+++ b/ATxService/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace ATxService.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@@ -61,7 +61,7 @@ namespace ATxService.Properties {
}
/// <summary>
- /// Looks up a localized string similar to autotransfer-v1-236-gc48c399
+ /// Looks up a localized string similar to 2.0-9-g98d8fc9-unclean
///.
/// </summary>
internal static string BuildCommit {
@@ -71,7 +71,7 @@ namespace ATxService.Properties {
}
/// <summary>
- /// Looks up a localized string similar to 2018-02-01 01:23:43
+ /// Looks up a localized string similar to 2018-02-27 15:06:43
///.
/// </summary>
internal static string BuildDate {
diff --git a/ATxService/Properties/Resources.resx b/ATxService/Properties/Resources.resx
index 0cf010f92b4834cfd281dd28fcb065bda0126202..af8a8e0d8aede6daca783f9de816c4e837b9105f 100644
--- a/ATxService/Properties/Resources.resx
+++ b/ATxService/Properties/Resources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
@@ -119,9 +119,9 @@
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="BuildCommit" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\BuildCommit.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <value>..\..\Resources\BuildCommit.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
<data name="BuildDate" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\BuildDate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <value>..\..\Resources\BuildDate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
</root>
\ No newline at end of file
diff --git a/ATxTray/ATXTray.csproj b/ATxTray/ATXTray.csproj
index 3080ad93074147a400cc7d657d27f7ac43fa55ef..d426eed2e12735bcaff6f20efe62efaa138b28e5 100644
--- a/ATxTray/ATXTray.csproj
+++ b/ATxTray/ATXTray.csproj
@@ -108,16 +108,21 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
+ <Content Include="..\Resources\BuildCommit.txt">
+ <Link>Resources\BuildCommit.txt</Link>
+ </Content>
+ <Content Include="..\Resources\BuildDate.txt">
+ <Link>Resources\BuildDate.txt</Link>
+ </Content>
<Content Include="IconDefault.ico" />
- <None Include="Resources\BuildDate.txt" />
- <None Include="Resources\BuildCommit.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PreBuildEvent>PowerShell -NoProfile -ExecutionPolicy RemoteSigned $(SolutionDir)\Scripts\Prepare-Build.ps1 $(ProjectDir)</PreBuildEvent>
+ <PreBuildEvent>PowerShell -NoProfile -ExecutionPolicy RemoteSigned $(SolutionDir)Scripts\Prepare-Build.ps1 -SolutionDir $(SolutionDir) -ConfigurationName $(ConfigurationName)</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
- <PostBuildEvent>PowerShell -Command "Write-Host $(ConfigurationName)" > $(ProjectDir)\Resources\BuildConfiguration.txt</PostBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ATxTray/Properties/Resources.Designer.cs b/ATxTray/Properties/Resources.Designer.cs
index cc28f91d0d48e056ea8f86d1b1efb17ba7900d6a..ea2b14874bb4731492425b712ff7e42d3771b9bd 100644
--- a/ATxTray/Properties/Resources.Designer.cs
+++ b/ATxTray/Properties/Resources.Designer.cs
@@ -61,7 +61,7 @@ namespace ATxTray.Properties {
}
/// <summary>
- /// Looks up a localized string similar to autotransfer-v1-265-g1b03979-unclean
+ /// Looks up a localized string similar to 2.0-9-g98d8fc9-unclean
///.
/// </summary>
internal static string BuildCommit {
@@ -71,7 +71,7 @@ namespace ATxTray.Properties {
}
/// <summary>
- /// Looks up a localized string similar to 2018-02-06 11:38:53
+ /// Looks up a localized string similar to 2018-02-27 15:22:30
///.
/// </summary>
internal static string BuildDate {
diff --git a/ATxTray/Resources/.gitignore b/ATxTray/Resources/.gitignore
deleted file mode 100644
index 06696d3d12240c7657519d4c0b6895d033dbf687..0000000000000000000000000000000000000000
--- a/ATxTray/Resources/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-BuildDate.txt
-BuildConfiguration.txt
-BuildCommit.txt
\ No newline at end of file
diff --git a/AutoTx.sln b/AutoTx.sln
index 3e1f6d99431feaf923ea940f7c33c4db01237375..395272bbfb0f23038d3a92a029f8fa2c70990784 100644
--- a/AutoTx.sln
+++ b/AutoTx.sln
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2027
+VisualStudioVersion = 15.0.27130.2036
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATxService", "ATxService\ATxService.csproj", "{5CB67E3A-E63A-4791-B90B-8CEF0027AEAD}"
EndProject
@@ -16,6 +16,9 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3E945C19-14E3-4FE8-9008-480D4EA57F45}"
ProjectSection(SolutionItems) = preProject
Resources\auto-tx-logo.png = Resources\auto-tx-logo.png
+ Resources\BuildCommit.txt = Resources\BuildCommit.txt
+ Resources\BuildConfiguration.txt = Resources\BuildConfiguration.txt
+ Resources\BuildDate.txt = Resources\BuildDate.txt
Resources\BuildDetails.cs = Resources\BuildDetails.cs
Resources\Mail-Templates\DiskSpace-Low.txt = Resources\Mail-Templates\DiskSpace-Low.txt
Resources\Mail-Templates\Transfer-Interrupted.txt = Resources\Mail-Templates\Transfer-Interrupted.txt
diff --git a/ATxService/Resources/.gitignore b/Resources/.gitignore
similarity index 100%
rename from ATxService/Resources/.gitignore
rename to Resources/.gitignore
diff --git a/Scripts/Make-Package.ps1 b/Scripts/Make-Package.ps1
index e0d96c24d85aec47c404b12c77af4e297e7c8dda..2299805f6a6c9abd8dc9c792eec1d69b7414abcc 100644
--- a/Scripts/Make-Package.ps1
+++ b/Scripts/Make-Package.ps1
@@ -1,5 +1,4 @@
-$ResourceDir = "..\ATxService\Resources"
-$RsrcDirCommon = "..\Resources"
+$ResourceDir = "..\Resources"
function Highlight([string]$Message, [string]$Color = "Cyan", $Indent = $False) {
@@ -63,8 +62,8 @@ Copy-Item -Exclude *.pdb -Recurse "$($BinariesDirTrayApp)\*" $tgt -EA Ignore
Copy-Item -Exclude *.pdb -Recurse "$($BinariesDirCfgTest)\*" $tgt -EA Ignore
# provide an up-to-date version of the example config file:
$example = New-Item -ItemType Container -Path $PkgDir -Name "conf-example"
-Copy-Item "$($RsrcDirCommon)\conf\config.common.xml" $example
-Copy-Item "$($RsrcDirCommon)\conf\host-specific.template.xml" $example
+Copy-Item "$($ResourceDir)\conf\config.common.xml" $example
+Copy-Item "$($ResourceDir)\conf\host-specific.template.xml" $example
Copy-Item "$($ResourceDir)\BuildDate.txt" "$($PkgDir)\AutoTx.log"
Copy-Item "$($ResourceDir)\BuildConfiguration.txt" $($PkgDir)
diff --git a/Scripts/Prepare-Build.ps1 b/Scripts/Prepare-Build.ps1
index 82c3b81d7a6d36a6309b79861ca2db269b097f8c..3fc5e52fbc4779b0a0f42b87e79dfae85ca3485d 100644
--- a/Scripts/Prepare-Build.ps1
+++ b/Scripts/Prepare-Build.ps1
@@ -1,6 +1,6 @@
[CmdletBinding()]
Param(
- [Parameter(Mandatory=$True)][string] $ProjectDir,
+ [Parameter(Mandatory=$True)][string] $SolutionDir,
[Parameter(Mandatory=$True)][string] $ConfigurationName
)
@@ -52,7 +52,7 @@ function Parse-GitDescribe([string]$CommitName) {
$ErrorActionPreference = "Stop"
$oldpwd = pwd
-cd $ProjectDir -ErrorAction Stop
+cd $SolutionDir -ErrorAction Stop
try {
$CommitName = & git describe --tags --long --match "[0-9].[0-9]"
@@ -79,10 +79,10 @@ catch {
$Date = Get-Date -Format 'yyyy-MM-dd HH:mm:ss'
-$BCommit = "$($ProjectDir)\Resources\BuildCommit.txt"
-$BuildDate = "$($ProjectDir)\Resources\BuildDate.txt"
-$BuildConfig = "$($ProjectDir)\Resources\BuildConfiguration.txt"
-$BuildDetailsCS = "$($ProjectDir)\..\Resources\BuildDetails.cs"
+$BCommit = "$($SolutionDir)\Resources\BuildCommit.txt"
+$BuildDate = "$($SolutionDir)\Resources\BuildDate.txt"
+$BuildConfig = "$($SolutionDir)\Resources\BuildConfiguration.txt"
+$BuildDetailsCS = "$($SolutionDir)\Resources\BuildDetails.cs"
Write-Output $Date > $BuildDate