Skip to content

Commit

Permalink
Fic loc paths from projects for localization and remove res swix (#63)
Browse files Browse the repository at this point in the history
* fix path for loc files

* fix path to lcl files

* mark vsix proj at not component

* add common dynamic projects to setversion

* fix path

* remove unnecessary swix res and add option to set isproductcomonent for setup

* check if property is set to true in microbuild before setting it

* rename microbuild variable for clarity
  • Loading branch information
spebl committed Sep 29, 2017
1 parent 7504f40 commit eb8121b
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 87 deletions.
Expand Up @@ -40,7 +40,7 @@
</PropertyGroup>
<ItemGroup>
<FilesToLocalize Include="$(OutDir)\GoogleTestAdapter.Common.Dynamic.dll">
<TranslationFile>$(MSBuildThisFileDirectory)..\loc\lcl\{Lang}\GoogleTestAdapter.Common.Dynamic.lcl</TranslationFile>
<TranslationFile>$(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.Common.Dynamic.dll.lcl</TranslationFile>
</FilesToLocalize>
<FilesToSign Include="$(OutDir)\GoogleTestAdapter.Common.Dynamic.dll" Condition="'$(RealSign)' == 'True'">
<Authenticode>Microsoft</Authenticode>
Expand Down
2 changes: 1 addition & 1 deletion GoogleTestAdapter/Core/Core.csproj
Expand Up @@ -42,7 +42,7 @@
</PropertyGroup>
<ItemGroup>
<FilesToLocalize Include="$(OutDir)\GoogleTestAdapter.Core.dll">
<TranslationFile>$(MSBuildThisFileDirectory)..\loc\lcl\{Lang}\GoogleTestAdapter.Core.lcl</TranslationFile>
<TranslationFile>$(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.Core.dll.lcl</TranslationFile>
</FilesToLocalize>
<FilesToSign Include="$(OutDir)\GoogleTestAdapter.Core.dll" Condition="'$(RealSign)' == 'True'">
<Authenticode>Microsoft</Authenticode>
Expand Down
2 changes: 1 addition & 1 deletion GoogleTestAdapter/DiaResolver/DiaResolver.csproj
Expand Up @@ -44,7 +44,7 @@
</PropertyGroup>
<ItemGroup>
<FilesToLocalize Include="$(OutDir)\GoogleTestAdapter.DiaResolver.dll">
<TranslationFile>$(MSBuildThisFileDirectory)..\loc\lcl\{Lang}\GoogleTestAdapter.DiaResolver.lcl</TranslationFile>
<TranslationFile>$(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.DiaResolver.dll.lcl</TranslationFile>
</FilesToLocalize>
<FilesToSign Include="$(OutDir)\GoogleTestAdapter.DiaResolver.dll" Condition="'$(RealSign)' == 'True'">
<Authenticode>Microsoft</Authenticode>
Expand Down
2 changes: 1 addition & 1 deletion GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj
Expand Up @@ -44,7 +44,7 @@
</PropertyGroup>
<ItemGroup>
<FilesToLocalize Include="$(OutDir)\NewProjectWizard.dll">
<TranslationFile>$(MSBuildThisFileDirectory)..\loc\lcl\{Lang}\NewProjectWizard.lcl</TranslationFile>
<TranslationFile>$(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\NewProjectWizard.dll.lcl</TranslationFile>
<SettingsFile>$(LSBuildRoot)\MCP_excludeBaml.lss</SettingsFile>
</FilesToLocalize>
<FilesToSign Include="$(OutDir)\NewProjectWizard.dll" Condition="'$(RealSign)' == 'True'">
Expand Down
2 changes: 1 addition & 1 deletion GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj
Expand Up @@ -26,7 +26,7 @@
<CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
<BypassVsixValidation>true</BypassVsixValidation>
<DeployExtension Condition="'$(TestAdapterFlavor)' != 'TAfGT'">false</DeployExtension>
<IsProductComponent>true</IsProductComponent>
<IsProductComponent Condition="'$(ProductComponent)' == 'true'">true</IsProductComponent>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
6 changes: 6 additions & 0 deletions GoogleTestAdapter/SetVersion.ps1
Expand Up @@ -2,6 +2,9 @@ Param([parameter(Mandatory=$true)] [string] $version)

$common_assembly_info = "Common\Properties\AssemblyInfo.cs"

$common_dynamic_gta_assembly_info = "Common.Dynamic.GTA\Properties\AssemblyInfo.cs"
$common_dynamic_tafgt_assembly_info = "Common.Dynamic.TAfGT\Properties\AssemblyInfo.cs"

$core_assembly_info = "Core\Properties\AssemblyInfo.cs"
$coretests_assembly_info = "Core.Tests\Properties\AssemblyInfo.cs"

Expand All @@ -28,6 +31,9 @@ $wizard_assembly_info = "NewProjectWizard\Properties\AssemblyInfo.cs"

(Get-Content $common_assembly_info) | ForEach-Object { $_ -replace "0.1.0.0", $version } | Set-Content $common_assembly_info

(Get-Content $common_dynamic_gta_assembly_info) | ForEach-Object { $_ -replace "0.1.0.0", $version } | Set-Content $common_dynamic_gta_assembly_info
(Get-Content $common_dynamic_tafgt_assembly_info) | ForEach-Object { $_ -replace "0.1.0.0", $version } | Set-Content $common_dynamic_tafgt_assembly_info

(Get-Content $core_assembly_info) | ForEach-Object { $_ -replace "0.1.0.0", $version } | Set-Content $core_assembly_info
(Get-Content $coretests_assembly_info) | ForEach-Object { $_ -replace "0.1.0.0", $version } | Set-Content $coretests_assembly_info

Expand Down
2 changes: 1 addition & 1 deletion GoogleTestAdapter/TestAdapter/TestAdapter.csproj
Expand Up @@ -44,7 +44,7 @@
</PropertyGroup>
<ItemGroup>
<FilesToLocalize Include="$(OutDir)\GoogleTestAdapter.TestAdapter.dll">
<TranslationFile>$(MSBuildThisFileDirectory)..\loc\lcl\{Lang}\GoogleTestAdapter.TestAdapter.lcl</TranslationFile>
<TranslationFile>$(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.TestAdapter.dll.lcl</TranslationFile>
</FilesToLocalize>
<FilesToSign Include="$(OutDir)\GoogleTestAdapter.TestAdapter.dll" Condition="'$(RealSign)' == 'True'">
<Authenticode>Microsoft</Authenticode>
Expand Down
2 changes: 1 addition & 1 deletion GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj
Expand Up @@ -211,7 +211,7 @@
</ItemGroup>
<ItemGroup>
<FilesToLocalize Include="$(OutDir)\GoogleTestAdapter.VsPackage.TAfGT.dll">
<TranslationFile>$(MSBuildThisFileDirectory)..\loc\lcl\{Lang}\GoogleTestAdapter.VsPackage.TAfGT.lcl</TranslationFile>
<TranslationFile>$(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.VsPackage.TAfGT.dll.lcl</TranslationFile>
</FilesToLocalize>
<FilesToSign Include="$(OutDir)\GoogleTestAdapter.VsPackage.TAfGT.dll" Condition="'$(RealSign)' == 'True'">
<Authenticode>Microsoft</Authenticode>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit eb8121b

Please sign in to comment.