Reorganize What's New content and...

...oh yeah, update for WiX v6.0.0.

Author: barnson

astro.config.mjs

@@ -55,9 +55,11 @@ export default defineConfig({
 
         { label: 'WiX Toolset', collapsed: true, items: [
           'wix',
+
+          { label: 'What\'s new in WiX', collapsed: true, autogenerate: { directory: '/wix/whatsnew' } },
+
           'wix/using-wix',
           'wix/gethelp',
-          'wix/releasenotes',
 
           { label: 'Tutorial', collapsed: true, items: [
             { label: 'Tutorial Introduction', link: 'wix/tutorial/' },
@@ -87,8 +89,6 @@ export default defineConfig({
           { label: 'WiX extensions and custom actions', collapsed: true, autogenerate: { directory: '/wix/tools/wixext' } },
           { label: 'Burn', collapsed: true, autogenerate: { directory: '/wix/tools/burn' } },
 
-          { label: 'WiX v5 for WiX v4 users', collapsed: true, autogenerate: { directory: '/wix/fivefour' } },
-          { label: 'WiX v4 for WiX v3 users', collapsed: true, autogenerate: { directory: '/wix/fourthree' } },
           { label: 'Development', collapsed: true, autogenerate: { directory: '/wix/development' } },
           { label: 'WiX v3', badge: { text: 'deprecated', variant: 'danger' }, collapsed: true, items: [
             'wix/wix3',

examples/quick-start/QuickStart.wixproj

@@ -1,2 +1,2 @@
-<Project Sdk="WixToolset.Sdk/5.0.1">
+<Project Sdk="WixToolset.Sdk/6.0.0">
 </Project>

public/_redirects

@@ -1,3 +1,11 @@
 /releases /wix/releasenotes/
 /wix/release /wix/releasenotes/
 /wix/releases /wix/releasenotes/
+/wix/fivefour/ /wix/whatsnew/
+/wix/fivefour/oopbas/ /wix/whatsnew/oopbas/
+/wix/fourthree/ /wix/whatsnew/
+/wix/fourthree/faqs/ /wix/whatsnew/faqs/
+/wix/releasenotes/ /wix/whatsnew/releasenotes/
+/wix/releasenotes /wix/whatsnew/releasenotes/
+/wixtoolset/ /wix/
+/wixtoolset /wix/

src/content/docs/heatwave/converting-wix-v3-projects.md

@@ -9,5 +9,5 @@ With HeatWave, you can convert WiX v3 .wixproj projects to modern WiX using the
 
 ![HeatWave converter screenshot](/images/docs/converter0.png)
 
-When you confirm, HeatWave converts the WiX v3 .wixproj to the latest version of WiX as an SDK-style MSBuild project. It also converts the WiX source files you selected. If HeatWave encountered any errors during the automated conversion, it shows them in a .log file so you can rectify the problem using human-brain-style conversion. [The WiX team is collecting real-world reports of how to handle manual conversion here.](/wix/fourthree/)
+When you confirm, HeatWave converts the WiX v3 .wixproj to the latest version of WiX as an SDK-style MSBuild project. It also converts the WiX source files you selected. If HeatWave encountered any errors during the automated conversion, it shows them in a .log file so you can rectify the problem using human-brain-style conversion. [The WiX team is collecting real-world reports of how to handle manual conversion here.](/wix/whatsnew/faqs/)
 

src/content/docs/wix/fourthree/index.md

@@ -5,7 +5,7 @@ title: MSBuild
 WiX v4 is available as an MSBuild SDK. SDK-style projects have smart defaults that make for simple .wixproj project authoring. For example, here's a minimal .wixproj that builds an MSI from the .wxs source files in the project directory:
 
 ```xml
-<Project Sdk="WixToolset.Sdk/5.0.0">
+<Project Sdk="WixToolset.Sdk/6.0.0">
 </Project>
 ```
 
@@ -141,7 +141,7 @@ You can then reference `MyProductNameProperty`, for example, in other properties
 To make property values available as preprocessor variables in your WiX authoring, add them to the `DefineConstants` property. For example:
 
 ```xml
-<Project Sdk="WixToolset.Sdk/5.0.0">
+<Project Sdk="WixToolset.Sdk/6.0.0">
   <PropertyGroup Label="Globals">
      <DefineConstants>MyProductNameProperty=$(MyProductNameProperty);</DefineConstants>
   </PropertyGroup>

src/content/docs/wix/tools/msbuild.md

@@ -252,7 +252,7 @@ Manage the extension cache. Extensions are referenced by:
 - `id` (uses the latest available version)
 
 :::note
-When omitting `version`, `wix extension` commands could choose a version of an extension that is incompatible with the version of WiX you're running. Use a specific version to avoid that scenario. For example: `wix extension add WixToolset.Util.wixext/5.0.0`
+When omitting `version`, `wix extension` commands could choose a version of an extension that is incompatible with the version of WiX you're running. Use a specific version to avoid that scenario. For example: `wix extension add WixToolset.Util.wixext/6.0.0`
 :::
 
 | Subcommand | Description |

src/content/docs/wix/tools/wixexe.md

@@ -61,8 +61,8 @@ You might need to specify a version for WiX extension packages (such as when the
 
 ```xml
 <ItemGroup>
-  <PackageReference Include="WixToolset.Bal.wixext" Version="5.0.0-rc.2" />
-  <PackageReference Include="WixToolset.Util.wixext" Version="5.0.0-rc.2" />
+  <PackageReference Include="WixToolset.Bal.wixext" Version="7.0.0-rc.2" />
+  <PackageReference Include="WixToolset.Util.wixext" Version="7.0.0-rc.2" />
 </ItemGroup>
 ```
 

src/content/docs/wix/tools/wixext/index.md

@@ -7,7 +7,7 @@ The WixQuietExec custom action family allows you to run an arbitrary command lin
 
 ## Architecture-specific custom action DLLs
 
-[As noted in _Frequently-asked questions about upgrading from WiX v3 to WiX v4_](../../../fourthree/faqs/#converting-custom-action-ids-customactionids), some extra effort is sometimes required due to WiX v4's support for architecture-specific custom actions. That effort for WixQuietExec and friends is a little bit different:
+[As noted in _Frequently-asked questions about upgrading from WiX v3 to WiX v4_](/wix/whatsnew/faqs/#converting-custom-action-ids-customactionids), some extra effort is sometimes required due to WiX v4's support for architecture-specific custom actions. That effort for WixQuietExec and friends is a little bit different:
 
 - The custom action ids are architecture-neutral (that is, they don't have architecture-specific suffixes).
 - The custom action DLLs have architecture-specific ids.

src/content/docs/wix/tools/wixext/quietexec.md

@@ -28,7 +28,7 @@ SDK-style projects have smart defaults that make for simple .wixproj project aut
 For example, here's a minimal .wixproj that builds an MSI from the .wxs source files in the project directory:
 
 ```xml
-<Project Sdk="WixToolset.Sdk/5.0.1">
+<Project Sdk="WixToolset.Sdk/6.0.0">
 </Project>
 ```
 
@@ -37,7 +37,7 @@ For example, here's a minimal .wixproj that builds an MSI from the .wxs source f
 To update your .wixproj MSBuild projects from previous WiX releases, update the `Project` element's `Sdk` attribute:
 
 ```xml
-<Project Sdk="WixToolset.Sdk/5.0.1">
+<Project Sdk="WixToolset.Sdk/6.0.0">
 ```
 
 For `PackageReference`s to WiX extensions, update their `Version` attribute. For example:
@@ -112,7 +112,7 @@ dotnet nuget add source https://nuget.pkg.github.com/wixtoolset/index.json -n wi
 You need to use exact versions for those packages. For example:
 
 ```xml
-<Project Sdk="WixToolset.Sdk/6.0.0-rc.1-build.42">
+<Project Sdk="WixToolset.Sdk/6.0.1-build.47">
 </Project>
 ```