diff options
author | Rob Mensching <rob@firegiant.com> | 2024-01-11 18:26:20 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2024-03-06 18:03:38 -0800 |
commit | 0d3d54992104288e9ee0c834d0b96e8502fd2d42 (patch) | |
tree | 9efa49c4983cd2ba1becab64bd1f2faccac88acf /src/ext/NetFx | |
parent | 2824298d9dd817a47527c920363556b54ead5d5d (diff) | |
download | wix-0d3d54992104288e9ee0c834d0b96e8502fd2d42.tar.gz wix-0d3d54992104288e9ee0c834d0b96e8502fd2d42.tar.bz2 wix-0d3d54992104288e9ee0c834d0b96e8502fd2d42.zip |
Move the BootstrapperApplication out of proc
Diffstat (limited to 'src/ext/NetFx')
-rw-r--r-- | src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3_Platform.wxi | 8 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetFx462.wxs | 4 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetFx472.wxs | 4 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetFx48.wxs | 4 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetFx481.wxs | 44 |
5 files changed, 32 insertions, 32 deletions
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3_Platform.wxi b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3_Platform.wxi index affe0143..e8f981ea 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3_Platform.wxi +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3_Platform.wxi | |||
@@ -35,7 +35,7 @@ | |||
35 | <PackageGroupRef Id="$(var.AspNetCoreRedistId)" /> | 35 | <PackageGroupRef Id="$(var.AspNetCoreRedistId)" /> |
36 | </PackageGroup> | 36 | </PackageGroup> |
37 | 37 | ||
38 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.AspNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> | 38 | <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.AspNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> |
39 | </Fragment> | 39 | </Fragment> |
40 | 40 | ||
41 | <Fragment> | 41 | <Fragment> |
@@ -43,7 +43,7 @@ | |||
43 | <PackageGroupRef Id="$(var.DesktopNetCoreRedistId)" /> | 43 | <PackageGroupRef Id="$(var.DesktopNetCoreRedistId)" /> |
44 | </PackageGroup> | 44 | </PackageGroup> |
45 | 45 | ||
46 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DesktopNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> | 46 | <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.DesktopNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> |
47 | </Fragment> | 47 | </Fragment> |
48 | 48 | ||
49 | <Fragment> | 49 | <Fragment> |
@@ -51,7 +51,7 @@ | |||
51 | <PackageGroupRef Id="$(var.DotNetCoreRedistId)" /> | 51 | <PackageGroupRef Id="$(var.DotNetCoreRedistId)" /> |
52 | </PackageGroup> | 52 | </PackageGroup> |
53 | 53 | ||
54 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> | 54 | <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> |
55 | </Fragment> | 55 | </Fragment> |
56 | 56 | ||
57 | <Fragment> | 57 | <Fragment> |
@@ -59,6 +59,6 @@ | |||
59 | <PackageGroupRef Id="$(var.DotNetCoreSdkRedistId)" /> | 59 | <PackageGroupRef Id="$(var.DotNetCoreSdkRedistId)" /> |
60 | </PackageGroup> | 60 | </PackageGroup> |
61 | 61 | ||
62 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreSdkRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> | 62 | <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.DotNetCoreSdkRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> |
63 | </Fragment> | 63 | </Fragment> |
64 | </Include> | 64 | </Include> |
diff --git a/src/ext/NetFx/wixlib/NetFx462.wxs b/src/ext/NetFx/wixlib/NetFx462.wxs index 904d2be0..57407bcd 100644 --- a/src/ext/NetFx/wixlib/NetFx462.wxs +++ b/src/ext/NetFx/wixlib/NetFx462.wxs | |||
@@ -40,7 +40,7 @@ | |||
40 | <PackageGroupRef Id="$(var.NetFx462WebId)" /> | 40 | <PackageGroupRef Id="$(var.NetFx462WebId)" /> |
41 | </PackageGroup> | 41 | </PackageGroup> |
42 | 42 | ||
43 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462WebId)" LicenseUrl="$(var.NetFx462EulaLink)" /> | 43 | <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx462WebId)" LicenseUrl="$(var.NetFx462EulaLink)" /> |
44 | </Fragment> | 44 | </Fragment> |
45 | 45 | ||
46 | <Fragment> | 46 | <Fragment> |
@@ -62,6 +62,6 @@ | |||
62 | <PackageGroupRef Id="$(var.NetFx462RedistId)" /> | 62 | <PackageGroupRef Id="$(var.NetFx462RedistId)" /> |
63 | </PackageGroup> | 63 | </PackageGroup> |
64 | 64 | ||
65 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462RedistId)" LicenseUrl="$(var.NetFx462EulaLink)" /> | 65 | <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx462RedistId)" LicenseUrl="$(var.NetFx462EulaLink)" /> |
66 | </Fragment> | 66 | </Fragment> |
67 | </Wix> | 67 | </Wix> |
diff --git a/src/ext/NetFx/wixlib/NetFx472.wxs b/src/ext/NetFx/wixlib/NetFx472.wxs index 15cb0de2..7d2ce72d 100644 --- a/src/ext/NetFx/wixlib/NetFx472.wxs +++ b/src/ext/NetFx/wixlib/NetFx472.wxs | |||
@@ -40,7 +40,7 @@ | |||
40 | <PackageGroupRef Id="$(var.NetFx472WebId)" /> | 40 | <PackageGroupRef Id="$(var.NetFx472WebId)" /> |
41 | </PackageGroup> | 41 | </PackageGroup> |
42 | 42 | ||
43 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472WebId)" LicenseUrl="$(var.NetFx472EulaLink)" /> | 43 | <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx472WebId)" LicenseUrl="$(var.NetFx472EulaLink)" /> |
44 | </Fragment> | 44 | </Fragment> |
45 | 45 | ||
46 | <Fragment> | 46 | <Fragment> |
@@ -62,6 +62,6 @@ | |||
62 | <PackageGroupRef Id="$(var.NetFx472RedistId)" /> | 62 | <PackageGroupRef Id="$(var.NetFx472RedistId)" /> |
63 | </PackageGroup> | 63 | </PackageGroup> |
64 | 64 | ||
65 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472RedistId)" LicenseUrl="$(var.NetFx472EulaLink)" /> | 65 | <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx472RedistId)" LicenseUrl="$(var.NetFx472EulaLink)" /> |
66 | </Fragment> | 66 | </Fragment> |
67 | </Wix> | 67 | </Wix> |
diff --git a/src/ext/NetFx/wixlib/NetFx48.wxs b/src/ext/NetFx/wixlib/NetFx48.wxs index fc2f97f5..395a0b47 100644 --- a/src/ext/NetFx/wixlib/NetFx48.wxs +++ b/src/ext/NetFx/wixlib/NetFx48.wxs | |||
@@ -40,7 +40,7 @@ | |||
40 | <PackageGroupRef Id="$(var.NetFx48WebId)" /> | 40 | <PackageGroupRef Id="$(var.NetFx48WebId)" /> |
41 | </PackageGroup> | 41 | </PackageGroup> |
42 | 42 | ||
43 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48WebId)" LicenseUrl="$(var.NetFx48EulaLink)" /> | 43 | <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx48WebId)" LicenseUrl="$(var.NetFx48EulaLink)" /> |
44 | </Fragment> | 44 | </Fragment> |
45 | 45 | ||
46 | <Fragment> | 46 | <Fragment> |
@@ -62,6 +62,6 @@ | |||
62 | <PackageGroupRef Id="$(var.NetFx48RedistId)" /> | 62 | <PackageGroupRef Id="$(var.NetFx48RedistId)" /> |
63 | </PackageGroup> | 63 | </PackageGroup> |
64 | 64 | ||
65 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48RedistId)" LicenseUrl="$(var.NetFx48EulaLink)" /> | 65 | <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx48RedistId)" LicenseUrl="$(var.NetFx48EulaLink)" /> |
66 | </Fragment> | 66 | </Fragment> |
67 | </Wix> | 67 | </Wix> |
diff --git a/src/ext/NetFx/wixlib/NetFx481.wxs b/src/ext/NetFx/wixlib/NetFx481.wxs index b0da8bb0..dc29a585 100644 --- a/src/ext/NetFx/wixlib/NetFx481.wxs +++ b/src/ext/NetFx/wixlib/NetFx481.wxs | |||
@@ -63,7 +63,7 @@ | |||
63 | <PackageGroupRef Id="$(var.NetFx481WebId)" /> | 63 | <PackageGroupRef Id="$(var.NetFx481WebId)" /> |
64 | </PackageGroup> | 64 | </PackageGroup> |
65 | 65 | ||
66 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx481WebId)" LicenseUrl="$(var.NetFx481EulaLink)" /> | 66 | <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx481WebId)" LicenseUrl="$(var.NetFx481EulaLink)" /> |
67 | </Fragment> | 67 | </Fragment> |
68 | 68 | ||
69 | <Fragment> | 69 | <Fragment> |
@@ -74,28 +74,28 @@ | |||
74 | <WixVariable Id="NetFx481RedistPackageDirectory" Value="redist\" Overridable="yes" /> | 74 | <WixVariable Id="NetFx481RedistPackageDirectory" Value="redist\" Overridable="yes" /> |
75 | 75 | ||
76 | <PackageGroup Id="$(var.NetFx481RedistId)"> | 76 | <PackageGroup Id="$(var.NetFx481RedistId)"> |
77 | <ExePackage | 77 | <ExePackage |
78 | CacheId="$(var.NetFx481RedistId)_AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" | 78 | CacheId="$(var.NetFx481RedistId)_AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" |
79 | InstallArguments="/q /norestart /log "[NetFx481RedistLog].html"" | 79 | InstallArguments="/q /norestart /log "[NetFx481RedistLog].html"" |
80 | PerMachine="yes" | 80 | PerMachine="yes" |
81 | DetectCondition="!(wix.NetFx481RedistDetectCondition)" | 81 | DetectCondition="!(wix.NetFx481RedistDetectCondition)" |
82 | InstallCondition="!(wix.NetFx481RedistInstallCondition)" | 82 | InstallCondition="!(wix.NetFx481RedistInstallCondition)" |
83 | Id="$(var.NetFx481RedistId)" | 83 | Id="$(var.NetFx481RedistId)" |
84 | Vital="yes" | 84 | Vital="yes" |
85 | Permanent="yes" | 85 | Permanent="yes" |
86 | Protocol="netfx4" | 86 | Protocol="netfx4" |
87 | LogPathVariable="NetFx481RedistLog" | 87 | LogPathVariable="NetFx481RedistLog" |
88 | Cache="remove"> | 88 | Cache="remove"> |
89 | 89 | ||
90 | <ExePackagePayload | 90 | <ExePackagePayload |
91 | Name="!(wix.NetFx481RedistPackageDirectory)ndp481-x86-x64-allos-enu.exe" | 91 | Name="!(wix.NetFx481RedistPackageDirectory)ndp481-x86-x64-allos-enu.exe" |
92 | DownloadUrl="$(var.NetFx481RedistLink)" | 92 | DownloadUrl="$(var.NetFx481RedistLink)" |
93 | ProductName="Microsoft .NET Framework 4.8.1" | 93 | ProductName="Microsoft .NET Framework 4.8.1" |
94 | Description="Microsoft .NET Framework 4.8.1 Setup" | 94 | Description="Microsoft .NET Framework 4.8.1 Setup" |
95 | CertificatePublicKey="0A7D1EFF01D4EBAD21E85C51499576EBAA40E676" | 95 | CertificatePublicKey="0A7D1EFF01D4EBAD21E85C51499576EBAA40E676" |
96 | CertificateThumbprint="AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" | 96 | CertificateThumbprint="AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" |
97 | Size="63610344" | 97 | Size="63610344" |
98 | Version="4.8.09037.06" | 98 | Version="4.8.09037.06" |
99 | /> | 99 | /> |
100 | </ExePackage> | 100 | </ExePackage> |
101 | </PackageGroup> | 101 | </PackageGroup> |
@@ -106,6 +106,6 @@ | |||
106 | <PackageGroupRef Id="$(var.NetFx481RedistId)" /> | 106 | <PackageGroupRef Id="$(var.NetFx481RedistId)" /> |
107 | </PackageGroup> | 107 | </PackageGroup> |
108 | 108 | ||
109 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx481RedistId)" LicenseUrl="$(var.NetFx481EulaLink)" /> | 109 | <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx481RedistId)" LicenseUrl="$(var.NetFx481EulaLink)" /> |
110 | </Fragment> | 110 | </Fragment> |
111 | </Wix> | 111 | </Wix> |