diff options
Diffstat (limited to 'src/ext/NetFx/wixlib')
-rw-r--r-- | src/ext/NetFx/wixlib/NetCore3.1.12_x64.wxs | 58 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetCore3.1.12_x86.wxs | 58 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetCore3.1_x64.wxs | 22 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetCore3.1_x86.wxs | 22 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetCore3_Platform.wxi | 65 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetCoreShared.wxs | 4 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi | 15 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetfxBundleExtension_arm64.wxs | 7 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetfxBundleExtension_x64.wxs | 7 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetfxBundleExtension_x86.wxs | 7 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/netfx.wixproj | 12 |
11 files changed, 47 insertions, 230 deletions
diff --git a/src/ext/NetFx/wixlib/NetCore3.1.12_x64.wxs b/src/ext/NetFx/wixlib/NetCore3.1.12_x64.wxs deleted file mode 100644 index 3a1f5910..00000000 --- a/src/ext/NetFx/wixlib/NetCore3.1.12_x64.wxs +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
2 | |||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
4 | |||
5 | <?define NetCorePlatform = x64?> | ||
6 | <?define NetCoreIdVersion = 3112?> | ||
7 | <?define NetCoreVersion = 3.1.12?> | ||
8 | <?include NetCore3_Platform.wxi?> | ||
9 | |||
10 | <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/20cf277c-2ccf-449f-a0b8-925ba0c175e7/aa50b052ceb8a8d36a5b4f9b8d0bd91c/aspnetcore-runtime-3.1.12-win-x64.exe?> | ||
11 | <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/076a47e9-c65b-4b78-95a7-93eb988891a4/3574764590cfa650e0aa87c44d3fe384/windowsdesktop-runtime-3.1.12-win-x64.exe?> | ||
12 | <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/2fdc3009-cf5c-4cf6-8f3b-a61e83200cbb/2c71ee04b48103a7464f4e28a8bf339b/dotnet-runtime-3.1.12-win-x64.exe?> | ||
13 | |||
14 | <Fragment> | ||
15 | <util:DirectorySearchRef Id="$(var.AspNetCoreId)" /> | ||
16 | |||
17 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" /> | ||
18 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> | ||
19 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | ||
20 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" /> | ||
21 | |||
22 | <PackageGroup Id="$(var.AspNetCoreRedistId)"> | ||
23 | <ExePackage CacheId="$(var.AspNetCoreRedistId)_2485A7AFA98E178CB8F30C9838346B514AEA4769" InstallArguments="$(var.AspNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.AspNetCoreRedistId)" Vital="yes" Permanent="yes" Bundle="yes" LogPathVariable="$(var.AspNetCoreRedistLog)" Cache="remove"> | ||
24 | <ExePackagePayload Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.AspNetCoreRedistLink)" ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework" CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" Size="7841808" Version="3.1.12.21070" /> | ||
25 | </ExePackage> | ||
26 | </PackageGroup> | ||
27 | </Fragment> | ||
28 | |||
29 | <Fragment> | ||
30 | <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" /> | ||
31 | |||
32 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" /> | ||
33 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> | ||
34 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | ||
35 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" /> | ||
36 | |||
37 | <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> | ||
38 | <ExePackage CacheId="$(var.DesktopNetCoreRedistId)_2485A7AFA98E178CB8F30C9838346B514AEA4769" InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DesktopNetCoreRedistId)" Vital="yes" Permanent="yes" Bundle="yes" LogPathVariable="$(var.DesktopNetCoreRedistLog)" Cache="remove"> | ||
39 | <ExePackagePayload Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DesktopNetCoreRedistLink)" ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x64)" Description="Microsoft Windows Desktop Runtime - 3.1.12 (x64)" CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" Size="54284816" Version="3.1.12.29719" /> | ||
40 | </ExePackage> | ||
41 | </PackageGroup> | ||
42 | </Fragment> | ||
43 | |||
44 | <Fragment> | ||
45 | <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> | ||
46 | |||
47 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" /> | ||
48 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> | ||
49 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | ||
50 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" /> | ||
51 | |||
52 | <PackageGroup Id="$(var.DotNetCoreRedistId)"> | ||
53 | <ExePackage CacheId="$(var.DotNetCoreRedistId)_2485A7AFA98E178CB8F30C9838346B514AEA4769" InstallArguments="$(var.DotNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DotNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreRedistLog)" Cache="remove"> | ||
54 | <ExePackagePayload Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DotNetCoreRedistLink)" ProductName="Microsoft .NET Core Runtime - 3.1.12 (x64)" Description="Microsoft .NET Core Runtime - 3.1.12 (x64)" CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" Size="26090616" Version="3.1.12.29719" /> | ||
55 | </ExePackage> | ||
56 | </PackageGroup> | ||
57 | </Fragment> | ||
58 | </Wix> | ||
diff --git a/src/ext/NetFx/wixlib/NetCore3.1.12_x86.wxs b/src/ext/NetFx/wixlib/NetCore3.1.12_x86.wxs deleted file mode 100644 index e3a70daf..00000000 --- a/src/ext/NetFx/wixlib/NetCore3.1.12_x86.wxs +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
2 | |||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
4 | |||
5 | <?define NetCorePlatform = x86?> | ||
6 | <?define NetCoreIdVersion = 3112?> | ||
7 | <?define NetCoreVersion = 3.1.12?> | ||
8 | <?include NetCore3_Platform.wxi?> | ||
9 | |||
10 | <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/55d6ff56-2725-4657-bffd-fdf35d6816fd/7431d1d3533f0b1ac97df734c45c33f2/aspnetcore-runtime-3.1.12-win-x86.exe?> | ||
11 | <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/5d89a010-88bf-4e4e-ac12-a07258ddbf5f/1ff5dfe312c5bd9760f3b500b1b37597/windowsdesktop-runtime-3.1.12-win-x86.exe?> | ||
12 | <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/cbdd1603-7fa9-4957-8869-94e24963ba6c/ca0b7d1be494882d5a7433accfa3c94c/dotnet-runtime-3.1.12-win-x86.exe?> | ||
13 | |||
14 | <Fragment> | ||
15 | <util:DirectorySearchRef Id="$(var.AspNetCoreId)" /> | ||
16 | |||
17 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" /> | ||
18 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> | ||
19 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | ||
20 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" /> | ||
21 | |||
22 | <PackageGroup Id="$(var.AspNetCoreRedistId)"> | ||
23 | <ExePackage CacheId="$(var.AspNetCoreRedistId)_2485A7AFA98E178CB8F30C9838346B514AEA4769" InstallArguments="$(var.AspNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.AspNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.AspNetCoreRedistLog)" Cache="remove"> | ||
24 | <ExePackagePayload Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.AspNetCoreRedistLink)" ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework" Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework" CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" Size="7167176" Version="3.1.12.21070" /> | ||
25 | </ExePackage> | ||
26 | </PackageGroup> | ||
27 | </Fragment> | ||
28 | |||
29 | <Fragment> | ||
30 | <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" /> | ||
31 | |||
32 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" /> | ||
33 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> | ||
34 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | ||
35 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" /> | ||
36 | |||
37 | <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> | ||
38 | <ExePackage CacheId="$(var.DesktopNetCoreRedistId)_2485A7AFA98E178CB8F30C9838346B514AEA4769" InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DesktopNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DesktopNetCoreRedistLog)" Cache="remove"> | ||
39 | <ExePackagePayload Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DesktopNetCoreRedistLink)" ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x86)" Description="Microsoft Windows Desktop Runtime - 3.1.12 (x86)" CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" Size="48590696" Version="3.1.12.29719" /> | ||
40 | </ExePackage> | ||
41 | </PackageGroup> | ||
42 | </Fragment> | ||
43 | |||
44 | <Fragment> | ||
45 | <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> | ||
46 | |||
47 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" /> | ||
48 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> | ||
49 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | ||
50 | <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" /> | ||
51 | |||
52 | <PackageGroup Id="$(var.DotNetCoreRedistId)"> | ||
53 | <ExePackage CacheId="$(var.DotNetCoreRedistId)_2485A7AFA98E178CB8F30C9838346B514AEA4769" InstallArguments="$(var.DotNetCoreRedistInstallArguments)" PerMachine="yes" DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" Id="$(var.DotNetCoreRedistId)" Vital="yes" Permanent="yes" Protocol="burn" LogPathVariable="$(var.DotNetCoreRedistLog)" Cache="remove"> | ||
54 | <ExePackagePayload Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" DownloadUrl="$(var.DotNetCoreRedistLink)" ProductName="Microsoft .NET Core Runtime - 3.1.12 (x86)" Description="Microsoft .NET Core Runtime - 3.1.12 (x86)" CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18" CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769" Size="23392184" Version="3.1.12.29719" /> | ||
55 | </ExePackage> | ||
56 | </PackageGroup> | ||
57 | </Fragment> | ||
58 | </Wix> | ||
diff --git a/src/ext/NetFx/wixlib/NetCore3.1_x64.wxs b/src/ext/NetFx/wixlib/NetCore3.1_x64.wxs deleted file mode 100644 index 60d7c27f..00000000 --- a/src/ext/NetFx/wixlib/NetCore3.1_x64.wxs +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
2 | |||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
4 | |||
5 | <Fragment> | ||
6 | <PackageGroup Id="AspNetCoreRuntime31Redist_x64"> | ||
7 | <PackageGroupRef Id="AspNetCoreRuntime3112Redist_x64" /> | ||
8 | </PackageGroup> | ||
9 | </Fragment> | ||
10 | |||
11 | <Fragment> | ||
12 | <PackageGroup Id="DesktopNetCoreRuntime31Redist_x64"> | ||
13 | <PackageGroupRef Id="DesktopNetCoreRuntime3112Redist_x64" /> | ||
14 | </PackageGroup> | ||
15 | </Fragment> | ||
16 | |||
17 | <Fragment> | ||
18 | <PackageGroup Id="DotNetCoreRuntime31Redist_x64"> | ||
19 | <PackageGroupRef Id="DotNetCoreRuntime3112Redist_x64" /> | ||
20 | </PackageGroup> | ||
21 | </Fragment> | ||
22 | </Wix> | ||
diff --git a/src/ext/NetFx/wixlib/NetCore3.1_x86.wxs b/src/ext/NetFx/wixlib/NetCore3.1_x86.wxs deleted file mode 100644 index cfff07b3..00000000 --- a/src/ext/NetFx/wixlib/NetCore3.1_x86.wxs +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
2 | |||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
4 | |||
5 | <Fragment> | ||
6 | <PackageGroup Id="AspNetCoreRuntime31Redist_x86"> | ||
7 | <PackageGroupRef Id="AspNetCoreRuntime3112Redist_x86" /> | ||
8 | </PackageGroup> | ||
9 | </Fragment> | ||
10 | |||
11 | <Fragment> | ||
12 | <PackageGroup Id="DesktopNetCoreRuntime31Redist_x86"> | ||
13 | <PackageGroupRef Id="DesktopNetCoreRuntime3112Redist_x86" /> | ||
14 | </PackageGroup> | ||
15 | </Fragment> | ||
16 | |||
17 | <Fragment> | ||
18 | <PackageGroup Id="DotNetCoreRuntime31Redist_x86"> | ||
19 | <PackageGroupRef Id="DotNetCoreRuntime3112Redist_x86" /> | ||
20 | </PackageGroup> | ||
21 | </Fragment> | ||
22 | </Wix> | ||
diff --git a/src/ext/NetFx/wixlib/NetCore3_Platform.wxi b/src/ext/NetFx/wixlib/NetCore3_Platform.wxi deleted file mode 100644 index 88e672be..00000000 --- a/src/ext/NetFx/wixlib/NetCore3_Platform.wxi +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
2 | |||
3 | |||
4 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
5 | |||
6 | <?define AspNetCoreId = ASPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?> | ||
7 | <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?> | ||
8 | <?define AspNetCoreRedistLog = AspNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?> | ||
9 | <?define AspNetCoreRedistInstallArguments = /install /quiet /log "[$(var.AspNetCoreRedistLog)]"?> | ||
10 | <?define AspNetCoreRedistUninstallArguments = /uninstall /quiet /log "[$(var.AspNetCoreRedistLog)]"?> | ||
11 | |||
12 | <?define DesktopNetCoreId = DESKTOPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?> | ||
13 | <?define DesktopNetCoreRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?> | ||
14 | <?define DesktopNetCoreRedistLog = DesktopNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?> | ||
15 | <?define DesktopNetCoreRedistInstallArguments = /install /quiet /log "[$(var.DesktopNetCoreRedistLog)]"?> | ||
16 | <?define DesktopNetCoreRedistUninstallArguments = /uninstall /quiet /log "[$(var.DesktopNetCoreRedistLog)]"?> | ||
17 | |||
18 | <?define DotNetCoreId = DOTNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?> | ||
19 | <?define DotNetCoreRedistId = DotNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?> | ||
20 | <?define DotNetCoreRedistLog = DotNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?> | ||
21 | <?define DotNetCoreRedistInstallArguments = /install /quiet /log "[$(var.DotNetCoreRedistLog)]"?> | ||
22 | <?define DotNetCoreRedistUninstallArguments = /uninstall /quiet /log "[$(var.DotNetCoreRedistLog)]"?> | ||
23 | |||
24 | <?define DotNetHomeId = DOTNETHOME_$(var.NetCorePlatform)?> | ||
25 | <?define NetCoreEulaLink = https://go.microsoft.com/fwlink/?LinkId=329770?> | ||
26 | |||
27 | <Fragment> | ||
28 | <util:RegistrySearchRef Id="$(var.DotNetHomeId)" /> | ||
29 | <util:DirectorySearch Id="$(var.AspNetCoreId)" Variable="$(var.AspNetCoreId)" Path="[$(var.DotNetHomeId)]\shared\Microsoft.AspNetCore.App\$(var.NetCoreVersion)" Result="exists" After="$(var.DotNetHomeId)" /> | ||
30 | </Fragment> | ||
31 | |||
32 | <Fragment> | ||
33 | <util:RegistrySearchRef Id="$(var.DotNetHomeId)" /> | ||
34 | <util:DirectorySearch Id="$(var.DesktopNetCoreId)" Variable="$(var.DesktopNetCoreId)" Path="[$(var.DotNetHomeId)]\shared\Microsoft.WindowsDesktop.App\$(var.NetCoreVersion)" Result="exists" After="$(var.DotNetHomeId)" /> | ||
35 | </Fragment> | ||
36 | |||
37 | <Fragment> | ||
38 | <util:RegistrySearchRef Id="$(var.DotNetHomeId)" /> | ||
39 | <util:DirectorySearch Id="$(var.DotNetCoreId)" Variable="$(var.DotNetCoreId)" Path="[$(var.DotNetHomeId)]\shared\Microsoft.NETCore.App\$(var.NetCoreVersion)" Result="exists" After="$(var.DotNetHomeId)" /> | ||
40 | </Fragment> | ||
41 | |||
42 | <Fragment> | ||
43 | <PackageGroup Id="$(var.AspNetCoreRedistId)AsPrereq"> | ||
44 | <PackageGroupRef Id="$(var.AspNetCoreRedistId)" /> | ||
45 | </PackageGroup> | ||
46 | |||
47 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.AspNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> | ||
48 | </Fragment> | ||
49 | |||
50 | <Fragment> | ||
51 | <PackageGroup Id="$(var.DesktopNetCoreRedistId)AsPrereq"> | ||
52 | <PackageGroupRef Id="$(var.DesktopNetCoreRedistId)" /> | ||
53 | </PackageGroup> | ||
54 | |||
55 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DesktopNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> | ||
56 | </Fragment> | ||
57 | |||
58 | <Fragment> | ||
59 | <PackageGroup Id="$(var.DotNetCoreRedistId)AsPrereq"> | ||
60 | <PackageGroupRef Id="$(var.DotNetCoreRedistId)" /> | ||
61 | </PackageGroup> | ||
62 | |||
63 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> | ||
64 | </Fragment> | ||
65 | </Include> | ||
diff --git a/src/ext/NetFx/wixlib/NetCoreShared.wxs b/src/ext/NetFx/wixlib/NetCoreShared.wxs index 2045a5b9..51667117 100644 --- a/src/ext/NetFx/wixlib/NetCoreShared.wxs +++ b/src/ext/NetFx/wixlib/NetCoreShared.wxs | |||
@@ -1,8 +1,8 @@ | |||
1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
2 | 2 | ||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> |
4 | 4 | ||
5 | <?foreach PLATFORM in x86;x64?> | 5 | <?foreach PLATFORM in x86;x64;arm64?> |
6 | <Fragment> | 6 | <Fragment> |
7 | <util:RegistrySearch Id="DOTNETHOME_$(var.PLATFORM)" Variable="DOTNETHOME_$(var.PLATFORM)" Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.PLATFORM)" Value="InstallLocation" Result="value" Bitness="always32" /> | 7 | <util:RegistrySearch Id="DOTNETHOME_$(var.PLATFORM)" Variable="DOTNETHOME_$(var.PLATFORM)" Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.PLATFORM)" Value="InstallLocation" Result="value" Bitness="always32" /> |
8 | </Fragment> | 8 | </Fragment> |
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi b/src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi new file mode 100644 index 00000000..e3300534 --- /dev/null +++ b/src/ext/NetFx/wixlib/NetfxBundleExtension_Platform.wxi | |||
@@ -0,0 +1,15 @@ | |||
1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
2 | |||
3 | |||
4 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
5 | <?include ..\..\caDecor.wxi ?> | ||
6 | |||
7 | <Fragment> | ||
8 | <BundleExtension Id="$(var.Prefix)NetfxBundleExtension$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))netfxbe.dll" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\netfxbe.dll"> | ||
9 | <?foreach PLATFORM in x86;x64;arm64?> | ||
10 | <Payload SourceFile="!(bindpath.$(var.PLATFORM))netcoresearch.exe" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\$(var.PLATFORM)\netcoresearch.exe" /> | ||
11 | <Payload SourceFile="!(bindpath.$(var.PLATFORM))hostfxr.dll" Name="$(var.Prefix)NetfxBundleExtension$(var.Suffix)\$(var.PLATFORM)\hostfxr.dll" /> | ||
12 | <?endforeach?> | ||
13 | </BundleExtension> | ||
14 | </Fragment> | ||
15 | </Include> | ||
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_arm64.wxs b/src/ext/NetFx/wixlib/NetfxBundleExtension_arm64.wxs new file mode 100644 index 00000000..13757dd8 --- /dev/null +++ b/src/ext/NetFx/wixlib/NetfxBundleExtension_arm64.wxs | |||
@@ -0,0 +1,7 @@ | |||
1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
2 | |||
3 | |||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
5 | <?define platform=arm64 ?> | ||
6 | <?include NetfxBundleExtension_Platform.wxi ?> | ||
7 | </Wix> | ||
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_x64.wxs b/src/ext/NetFx/wixlib/NetfxBundleExtension_x64.wxs new file mode 100644 index 00000000..f6c27a8e --- /dev/null +++ b/src/ext/NetFx/wixlib/NetfxBundleExtension_x64.wxs | |||
@@ -0,0 +1,7 @@ | |||
1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
2 | |||
3 | |||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
5 | <?define platform=x64 ?> | ||
6 | <?include NetfxBundleExtension_Platform.wxi ?> | ||
7 | </Wix> | ||
diff --git a/src/ext/NetFx/wixlib/NetfxBundleExtension_x86.wxs b/src/ext/NetFx/wixlib/NetfxBundleExtension_x86.wxs new file mode 100644 index 00000000..76a8358f --- /dev/null +++ b/src/ext/NetFx/wixlib/NetfxBundleExtension_x86.wxs | |||
@@ -0,0 +1,7 @@ | |||
1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
2 | |||
3 | |||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
5 | <?define platform=x86 ?> | ||
6 | <?include NetfxBundleExtension_Platform.wxi ?> | ||
7 | </Wix> | ||
diff --git a/src/ext/NetFx/wixlib/netfx.wixproj b/src/ext/NetFx/wixlib/netfx.wixproj index ad7d028c..bc6a1172 100644 --- a/src/ext/NetFx/wixlib/netfx.wixproj +++ b/src/ext/NetFx/wixlib/netfx.wixproj | |||
@@ -14,9 +14,15 @@ | |||
14 | </ItemGroup> | 14 | </ItemGroup> |
15 | 15 | ||
16 | <ItemGroup> | 16 | <ItemGroup> |
17 | <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" /> | 17 | <ProjectReference Include="..\be\netfxbe.vcxproj" Properties="Platform=ARM64" /> |
18 | <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> | 18 | <ProjectReference Include="..\be\netfxbe.vcxproj" Properties="Platform=x64" /> |
19 | <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" /> | 19 | <ProjectReference Include="..\be\netfxbe.vcxproj" Properties="Platform=x86" /> |
20 | <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" /> | ||
21 | <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" /> | ||
22 | <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" /> | ||
23 | <ProjectReference Include="..\netcoresearch\netcoresearch.vcxproj" Properties="Platform=ARM64" /> | ||
24 | <ProjectReference Include="..\netcoresearch\netcoresearch.vcxproj" Properties="Platform=x86" /> | ||
25 | <ProjectReference Include="..\netcoresearch\netcoresearch.vcxproj" Properties="Platform=x64" /> | ||
20 | </ItemGroup> | 26 | </ItemGroup> |
21 | 27 | ||
22 | <ItemGroup> | 28 | <ItemGroup> |