diff options
Diffstat (limited to 'src/ext/NetFx')
-rw-r--r-- | src/ext/NetFx/README.md | 54 | ||||
-rw-r--r-- | src/ext/NetFx/netfx_t.proj | 6 | ||||
-rw-r--r-- | src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 4 | ||||
-rw-r--r-- | src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj | 5 | ||||
-rw-r--r-- | src/ext/NetFx/wixlib/NetFx48.wxs | 2 |
5 files changed, 67 insertions, 4 deletions
diff --git a/src/ext/NetFx/README.md b/src/ext/NetFx/README.md index a31cfd1d..dcc79786 100644 --- a/src/ext/NetFx/README.md +++ b/src/ext/NetFx/README.md | |||
@@ -1,2 +1,52 @@ | |||
1 | # NetFx.wixext | 1 | # WixToolset.NetFx.wixext - .NET Framework WiX Toolset Extension |
2 | WixToolset.NetFx.wixext - .NET Framework WiX Toolset Extension | 2 | |
3 | This WiX Extension provides support for configuring .NET Framework. | ||
4 | |||
5 | [Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions] | ||
6 | |||
7 | |||
8 | ## Open Source Maintenance Fee | ||
9 | |||
10 | To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula]. | ||
11 | |||
12 | To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset). | ||
13 | |||
14 | |||
15 | ## Getting started | ||
16 | |||
17 | Add the WiX Extension as a PackageReference to your .wixproj: | ||
18 | |||
19 | ``` | ||
20 | <Project Sdk="WixToolset.Sdk/7.0.0"> | ||
21 | <ItemGroup> | ||
22 | <PackageReference Include="WixToolset.NetFx.wixext" Version="7.0.0" /> | ||
23 | </ItemGroup> | ||
24 | </Project> | ||
25 | ``` | ||
26 | |||
27 | Then add the extension's namespace: | ||
28 | |||
29 | ``` | ||
30 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | ||
31 | xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx"> | ||
32 | |||
33 | .. | ||
34 | </Wix> | ||
35 | ``` | ||
36 | |||
37 | ## Additional resources | ||
38 | |||
39 | * [WiX Website][web] | ||
40 | * [WiX Documentation][docs] | ||
41 | * [WiX Issue Tracker][issues] | ||
42 | * [WiX Discussions][discussions] | ||
43 | |||
44 | |||
45 | [web]: https://www.firegiant.com/wixtoolset/ | ||
46 | [docs]: https://docs.firegiant.com/wixtoolset/ | ||
47 | [issues]: https://github.com/wixtoolset/issues/issues | ||
48 | [discussions]: https://github.com/orgs/wixtoolset/discussions | ||
49 | [sdk]: https://www.nuget.org/packages/WixToolset.Sdk/ | ||
50 | [osmf]: https://opensourcemaintenancefee.org/ | ||
51 | [license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT | ||
52 | [eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt | ||
diff --git a/src/ext/NetFx/netfx_t.proj b/src/ext/NetFx/netfx_t.proj index 1c1b8a61..86996e42 100644 --- a/src/ext/NetFx/netfx_t.proj +++ b/src/ext/NetFx/netfx_t.proj | |||
@@ -4,7 +4,7 @@ | |||
4 | <Project Sdk="Microsoft.Build.Traversal"> | 4 | <Project Sdk="Microsoft.Build.Traversal"> |
5 | <ItemGroup> | 5 | <ItemGroup> |
6 | <ProjectReference Include="wixlib\netfx.wixproj" /> | 6 | <ProjectReference Include="wixlib\netfx.wixproj" /> |
7 | <ProjectReference Include="test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj" Targets="Test" /> | 7 | <ProjectReference Include="test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj" /> |
8 | <ProjectReference Include="wixext\WixToolset.Netfx.wixext.csproj" Targets="Pack" Properties="NoBuild=true" /> | 8 | <ProjectReference Include="wixext\WixToolset.Netfx.wixext.csproj" Targets="Pack" Properties="NoBuild=true" /> |
9 | </ItemGroup> | 9 | </ItemGroup> |
10 | 10 | ||
@@ -23,4 +23,8 @@ | |||
23 | 23 | ||
24 | <Delete Files="$(ArtifactsFolder)WixToolset.NetFx.wixext.*.nupkg" /> | 24 | <Delete Files="$(ArtifactsFolder)WixToolset.NetFx.wixext.*.nupkg" /> |
25 | </Target> | 25 | </Target> |
26 | |||
27 | <Target Name="WixTest"> | ||
28 | <MSBuild Projects="test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj" Targets="Test" /> | ||
29 | </Target> | ||
26 | </Project> | 30 | </Project> |
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs index 37f715bf..381270d4 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs | |||
@@ -1,5 +1,9 @@ | |||
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 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
4 | |||
5 | [assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] | ||
6 | |||
3 | namespace WixToolsetTest.Netfx | 7 | namespace WixToolsetTest.Netfx |
4 | { | 8 | { |
5 | using System.IO; | 9 | using System.IO; |
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj index 67759ab3..2c63a42d 100644 --- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj +++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj | |||
@@ -7,6 +7,7 @@ | |||
7 | <RootNamespace>WixToolset.Netfx</RootNamespace> | 7 | <RootNamespace>WixToolset.Netfx</RootNamespace> |
8 | <Description>WiX Toolset .NET extension</Description> | 8 | <Description>WiX Toolset .NET extension</Description> |
9 | <Title>WiX Toolset .NET extension</Title> | 9 | <Title>WiX Toolset .NET extension</Title> |
10 | <PackageReadmeFile>README.md</PackageReadmeFile> | ||
10 | <DebugType>embedded</DebugType> | 11 | <DebugType>embedded</DebugType> |
11 | </PropertyGroup> | 12 | </PropertyGroup> |
12 | 13 | ||
@@ -16,6 +17,10 @@ | |||
16 | <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" /> | 17 | <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" /> |
17 | </ItemGroup> | 18 | </ItemGroup> |
18 | 19 | ||
20 | <ItemGroup> | ||
21 | <None Include="..\README.md" Pack="true" PackagePath="\" /> | ||
22 | </ItemGroup> | ||
23 | |||
19 | <ItemGroup Condition=" '$(NCrunch)'=='' "> | 24 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
20 | <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> | 25 | <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> |
21 | </ItemGroup> | 26 | </ItemGroup> |
diff --git a/src/ext/NetFx/wixlib/NetFx48.wxs b/src/ext/NetFx/wixlib/NetFx48.wxs index a2aaf70f..14689829 100644 --- a/src/ext/NetFx/wixlib/NetFx48.wxs +++ b/src/ext/NetFx/wixlib/NetFx48.wxs | |||
@@ -52,7 +52,7 @@ | |||
52 | 52 | ||
53 | <PackageGroup Id="$(var.NetFx48RedistId)"> | 53 | <PackageGroup Id="$(var.NetFx48RedistId)"> |
54 | <ExePackage CacheId="$(var.NetFx48RedistId)_ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B" InstallArguments="/q /norestart /log "[NetFx48RedistLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx48RedistDetectCondition)" InstallCondition="!(wix.NetFx48RedistInstallCondition)" Id="$(var.NetFx48RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48RedistLog" Cache="remove"> | 54 | <ExePackage CacheId="$(var.NetFx48RedistId)_ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B" InstallArguments="/q /norestart /log "[NetFx48RedistLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx48RedistDetectCondition)" InstallCondition="!(wix.NetFx48RedistInstallCondition)" Id="$(var.NetFx48RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48RedistLog" Cache="remove"> |
55 | <ExePackagePayload Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe" DownloadUrl="$(var.NetFx48RedistLink)" ProductName="Microsoft .NET Framework 4.8" Description="Microsoft .NET Framework 4.8 Setup" CertificatePublicKey="F49F9B33E25E33CCA0BFB15A62B7C29FFAB3880B" CertificateThumbprint="C2048FB509F1C37A8C3E9EC6648118458AA01780" Size="121346568" Version="4.8.4115.0" /> | 55 | <ExePackagePayload Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe" DownloadUrl="$(var.NetFx48RedistLink)" ProductName="Microsoft .NET Framework 4.8" Description="Microsoft .NET Framework 4.8 Setup" CertificatePublicKey="597A58F3E398F113D0B4305649AEB6DCAD457361" CertificateThumbprint="C2048FB509F1C37A8C3E9EC6648118458AA01780" Size="121346568" Version="4.8.4115.0" /> |
56 | </ExePackage> | 56 | </ExePackage> |
57 | </PackageGroup> | 57 | </PackageGroup> |
58 | </Fragment> | 58 | </Fragment> |