Skip to content
Snippets Groups Projects
Commit 26e23ceb authored by Niko Ehrenfeuchter's avatar Niko Ehrenfeuchter :keyboard:
Browse files

Use central files for common / shared resources.

See https://stackoverflow.com/a/10334095/2018314 for details on sharing
resources among multiple projects in a solution.
parent 98d8fc91
Branches
Tags
No related merge requests found
<?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>
......
......@@ -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>
......
......@@ -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 {
......
<?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
......@@ -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)" &gt; $(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.
......
......@@ -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 {
......
BuildDate.txt
BuildConfiguration.txt
BuildCommit.txt
\ No newline at end of file

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
......
File moved
$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)
......
[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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment