Skip to content

Commit c192a73

Browse files
wtgodbewtgodbe
committed
Stop using WixThemeVariables
1 parent 750dbd3 commit c192a73

File tree

16 files changed

+29
-58
lines changed

16 files changed

+29
-58
lines changed

‎src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,4 @@
4040
</ItemGroup>
4141

4242
<Import Project="Sdk.targets" Sdk="Microsoft.Build.NoTargets" />
43-
44-
<PropertyGroup>
45-
<BundleNameShort>Microsoft ASP.NET Core $(PackageBrandingVersion)</BundleNameShort>
46-
<BundleNameSub>Shared Framework</BundleNameSub>
47-
<BundleName>$(BundleNameShort) - $(BundleNameSub) ($(TargetArchitecture))</BundleName>
48-
<BundleNameFull>$(BundleName)</BundleNameFull>
49-
</PropertyGroup>
50-
51-
<ItemGroup>
52-
<WixThemeVariable Include="BundleNameShort" Value="$(BundleNameShort)" />
53-
<WixThemeVariable Include="BundleNameSub" Value="$(BundleNameSub)" />
54-
<WixThemeVariable Include="BundleName" Value="$(BundleName)" />
55-
<WixThemeVariable Include="BundleNameFull" Value="$(BundleNameFull)" />
56-
</ItemGroup>
5743
</Project>

‎src/Framework/App.Runtime/bundle/bundle.thm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<Window Width="644" Height="460" HexStyle="100a0000" FontId="DefaultFont" Caption="#(loc.Caption)" IconFile="dotnet.ico">
1515
<ImageControl Name="DotNetLogo" X="12" Y="-48" Width="124" Height="124" ImageFile="DotNetLogo_256x.png" Visible="yes" />
1616
<Text X="80" Y="12" Width="-12" Height="40" FontId="WindowBannerFont" Visible="yes" DisablePrefix="yes">#(loc.Title)</Text>
17-
<Text X="80" Y="40" Width="-12" Height="40" FontId="WindowBannerFont" Visible="yes" DisablePrefix="yes">#(loc.SubTitle)</Text>
1817
<Page Name="Help">
1918
<Label Name="HelpHeader" X="148" Y="80" Width="-12" Height="32" FontId="PageHeaderFont" HexStyle="00000000" DisablePrefix="yes">#(loc.HelpHeader)</Label>
2019
<Label Name="HelpText" X="148" Y="124" Width="-12" Height="-48" FontId="DefaultFont" HexStyle="00000000" DisablePrefix="yes">#(loc.HelpText)</Label>

‎src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
2-
<String Id="Caption" Value="[BundleNameFull] 安裝程式" />
3-
<String Id="Title" Value="[BundleNameShort]" />
4-
<String Id="SubTitle" Value="[BundleNameSub]" />
2+
<String Id="Caption" Value="[WixBundleName] 安裝程式" />
3+
<String Id="Title" Value="[BUNDLEMONIKER]" />
54
<String Id="InstallVersion" Value="版本 [WixBundleVersion]" />
65
<String Id="ConfirmCancelMessage" Value="您確定要取消嗎?" />
76
<String Id="ExecuteUpgradeRelatedBundleMessage" Value="前一版" />

‎src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
2-
<String Id="Caption" Value="Instalační program pro [BundleNameFull]" />
3-
<String Id="Title" Value="[BundleNameShort]" />
4-
<String Id="SubTitle" Value="[BundleNameSub]" />
2+
<String Id="Caption" Value="Instalační program pro [WixBundleName]" />
3+
<String Id="Title" Value="[BUNDLEMONIKER]" />
54
<String Id="InstallVersion" Value="Verze [WixBundleVersion]" />
65
<String Id="ConfirmCancelMessage" Value="Opravdu chcete akci zrušit?" />
76
<String Id="ExecuteUpgradeRelatedBundleMessage" Value="Předchozí verze" />

‎src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
2-
<String Id="Caption" Value="[BundleNameFull]-Setup" />
3-
<String Id="Title" Value="[BundleNameShort]" />
4-
<String Id="SubTitle" Value="[BundleNameSub]" />
2+
<String Id="Caption" Value="[WixBundleName]-Setup" />
3+
<String Id="Title" Value="[BUNDLEMONIKER]" />
54
<String Id="InstallVersion" Value="Version von [WixBundleVersion]" />
65
<String Id="ConfirmCancelMessage" Value="Möchten Sie den Vorgang wirklich abbrechen?" />
76
<String Id="ExecuteUpgradeRelatedBundleMessage" Value="Vorherige Version" />

‎src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
2-
<!--_locComment_text="{Locked='[BundleNameFull]'}"-->
3-
<String Id="Caption" Value="[BundleNameFull] Setup" />
2+
<!--_locComment_text="{Locked='[WixBundleName]'}"-->
3+
<String Id="Caption" Value="[WixBundleName] Setup" />
44
<!--_locComment_text="{Locked}"-->
5-
<String Id="Title" Value="[BundleNameShort]" />
5+
<String Id="Title" Value="[BUNDLEMONIKER]" />
66
<!--_locComment_text="{Locked}"-->
7-
<String Id="SubTitle" Value="[BundleNameSub]" />
87
<!--_locComment_text="{Locked='[WixBundleVersion]'}"-->
98
<String Id="InstallVersion" Value="Version [WixBundleVersion]" />
109
<String Id="ConfirmCancelMessage" Value="Are you sure you want to cancel?" />

‎src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
2-
<String Id="Caption" Value="Installation de [BundleNameFull]" />
3-
<String Id="Title" Value="[BundleNameShort]" />
4-
<String Id="SubTitle" Value="[BundleNameSub]" />
2+
<String Id="Caption" Value="Installation de [WixBundleName]" />
3+
<String Id="Title" Value="[BUNDLEMONIKER]" />
54
<String Id="InstallVersion" Value="Version [WixBundleVersion]" />
65
<String Id="ConfirmCancelMessage" Value="Êtes-vous sûr de vouloir annuler ?" />
76
<String Id="ExecuteUpgradeRelatedBundleMessage" Value="Version précédente" />

‎src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
2-
<String Id="Caption" Value="Installazione di [BundleNameFull]" />
3-
<String Id="Title" Value="[BundleNameShort]" />
4-
<String Id="SubTitle" Value="[BundleNameSub]" />
2+
<String Id="Caption" Value="Installazione di [WixBundleName]" />
3+
<String Id="Title" Value="[BUNDLEMONIKER]" />
54
<String Id="InstallVersion" Value="Versione [WixBundleVersion]" />
65
<String Id="ConfirmCancelMessage" Value="Annullare?" />
76
<String Id="ExecuteUpgradeRelatedBundleMessage" Value="Versione precedente" />

‎src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
2-
<String Id="Caption" Value="[BundleNameFull] のセットアップ" />
3-
<String Id="Title" Value="[BundleNameShort]" />
4-
<String Id="SubTitle" Value="[BundleNameSub]" />
2+
<String Id="Caption" Value="[WixBundleName] のセットアップ" />
3+
<String Id="Title" Value="[BUNDLEMONIKER]" />
54
<String Id="InstallVersion" Value="バージョン [WixBundleVersion]" />
65
<String Id="ConfirmCancelMessage" Value="取り消しますか?" />
76
<String Id="ExecuteUpgradeRelatedBundleMessage" Value="以前のバージョン" />

‎src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
2-
<String Id="Caption" Value="[BundleNameFull] 설치" />
3-
<String Id="Title" Value="[BundleNameShort]" />
4-
<String Id="SubTitle" Value="[BundleNameSub]" />
2+
<String Id="Caption" Value="[WixBundleName] 설치" />
3+
<String Id="Title" Value="[BUNDLEMONIKER]" />
54
<String Id="InstallVersion" Value="버전 [WixBundleVersion]" />
65
<String Id="ConfirmCancelMessage" Value="취소하시겠습니까?" />
76
<String Id="ExecuteUpgradeRelatedBundleMessage" Value="이전 버전" />

0 commit comments

Comments
 (0)