Upgraded to Clang 14.0.4.

PathogenDavid · PathogenDavid · commit 9e11ce098fa0 · 2022-06-10T14:44:48.000-05:00
* ClangSharp has joined the .NET Foundation since we last updated. In the process its license and copyright notice changed. * ClangSharp no longer supports .NET 5, as such we no longer support .NET 5. (See #241 (comment)) * Clang 14 introduced a new "using" type class, and support for it was added to TypeReductionTransformation. Fixes #241
diff --git a/Biohazrd.AllInOne/Biohazrd.AllInOne.csproj b/Biohazrd.AllInOne/Biohazrd.AllInOne.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <!--
     This package is just a convenience package which brings in all the other components of Biohazrd.
diff --git a/Biohazrd.CSharp/Biohazrd.CSharp.csproj b/Biohazrd.CSharp/Biohazrd.CSharp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PackageDescription>This package provides transformations and binding generation for C#.</PackageDescription>
   </PropertyGroup>
 
diff --git a/Biohazrd.OutputGeneration/Biohazrd.OutputGeneration.csproj b/Biohazrd.OutputGeneration/Biohazrd.OutputGeneration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PackageDescription>This package provides language-agnostic functionality for writing out code and other files.</PackageDescription>
   </PropertyGroup>
 
diff --git a/Biohazrd.Transformation/Biohazrd.Transformation.csproj b/Biohazrd.Transformation/Biohazrd.Transformation.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PackageDescription>This package provides language-agnostic functionality for manipulating declaration trees.</PackageDescription>
   </PropertyGroup>
 
diff --git a/Biohazrd.Transformation/Common/TypeReductionTransformation.cs b/Biohazrd.Transformation/Common/TypeReductionTransformation.cs
@@ -22,6 +22,14 @@ protected override TypeTransformationResult TransformClangTypeReference(TypeTran
                 {
                     return new ClangTypeReference(elaboratedType.NamedType);
                 }
+                // Using types represent types accessed via C++ using declarations.
+                // For example, given the code below, `x` will be a typed via `UsingType`.
+                //   using std::error_code;
+                //   error_code x;
+                case Type { TypeClass: CX_TypeClass.CX_TypeClass_Using } usingType:
+                {
+                    return new ClangTypeReference(usingType.Desugar);
+                }
                 // We don't care that `auto` or `decltype` was used for a type, so we just replace them with their canonical form
                 case AutoType:
                 case DecltypeType:
diff --git a/Biohazrd.Utilities/Biohazrd.Utilities.csproj b/Biohazrd.Utilities/Biohazrd.Utilities.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PackageDescription>This package provides various language-agnostic helpers for Biohazrd generators.</PackageDescription>
   </PropertyGroup>
 
diff --git a/Biohazrd.sln b/Biohazrd.sln
@@ -43,7 +43,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Biohazrd.CSharp.Tests", "Te
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Biohazrd.OutputGeneration.Tests", "Tests\Biohazrd.OutputGeneration.Tests\Biohazrd.OutputGeneration.Tests.csproj", "{00E42A88-A883-4C43-BE2E-8A241A32EDA9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Biohazrd.AllInOne", "Biohazrd.AllInOne\Biohazrd.AllInOne.csproj", "{093ABF1F-E8E2-4E24-BCEA-845255E5BC5F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Biohazrd.AllInOne", "Biohazrd.AllInOne\Biohazrd.AllInOne.csproj", "{093ABF1F-E8E2-4E24-BCEA-845255E5BC5F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Biohazrd/Biohazrd.csproj b/Biohazrd/Biohazrd.csproj
@@ -1,22 +1,22 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- The Biohazrd package is an all-in-one package which brings in everything so we need to disambiguate this one. -->
     <PackageId>Biohazrd.Core</PackageId>
     <PackageDescription>This package provides core functionality for parsing C/C++ libraries.</PackageDescription>
 
-    <ClangSharpPathogenVersion>[0.0.3]</ClangSharpPathogenVersion>
+    <ClangSharpPathogenVersion>[0.0.4]</ClangSharpPathogenVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClangSharp" Version="[12.0.0-beta2]" />
+    <PackageReference Include="ClangSharp" Version="[14.0.0-beta2]" />
     <PackageReference Include="ClangSharp.Pathogen" Version="$(ClangSharpPathogenVersion)" />
     <PackageReference Include="ClangSharp.Pathogen.ClangResources" Version="$(ClangSharpPathogenVersion)" />
 
     <!-- Exclude ClangSharp's runtime packages (we provide libclang and libClangSharp via ClangSharp.Pathogen -->
-    <PackageReference Include="libClang" Version="12.0.0" PrivateAssets="all" />
-    <PackageReference Include="libClangSharp" Version="12.0.0-beta1" PrivateAssets="all" />
+    <PackageReference Include="libClang" Version="14.0.0" PrivateAssets="all" />
+    <PackageReference Include="libClangSharp" Version="14.0.0-beta1" PrivateAssets="all" />
 
     <!-- This package is needed to support __HACK__Stl1300Workaround -->
     <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="2.3.2262-g94fae01e" />
diff --git a/THIRD-PARTY-NOTICES.md b/THIRD-PARTY-NOTICES.md
@@ -12,20 +12,26 @@ Biohazrd incorporates third-party libraries licensed as follows.
 
 # ClangSharp
 
-```
-University of Illinois/NCSA Open Source License
-Copyright (c) Microsoft and Contributors
-All rights reserved.
-
-Developed by: Microsoft and Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal with the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution.
-Neither the names of Microsoft, nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
-```
+> # The MIT License (MIT)
+> 
+> Copyright © .NET Foundation and Contributors. All Rights Reserved.
+> 
+> Permission is hereby granted, free of charge, to any person obtaining a copy of
+> this software and associated documentation files (the "Software"), to deal in
+> the Software without restriction, including without limitation the rights to
+> use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+> the Software, and to permit persons to whom the Software is furnished to do so,
+> subject to the following conditions:
+> 
+> The above copyright notice and this permission notice shall be included in all
+> copies or substantial portions of the Software.
+> 
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+> FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+> COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+> IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+> CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # ClangSharp.Pathogen
 
diff --git a/docs/PlatformSupport.md b/docs/PlatformSupport.md
@@ -82,7 +82,7 @@ In addition to Biohazrd's handling of ABI concerns, some features of Biohazrd re
 
 ### .NET runtime support
 
-Biohazrd its self is a .NET 5 library, so generators themselves must target .NET 5 or newer. (.NET 6 or newer is recommended since .NET 5 is out of support. .NET 5 is supported a courtesy to those stuck on Visual Studio 2019.)
+Biohazrd its self is a .NET 6 library, so generators themselves must target .NET 6 or newer. We intend to support .NET 6 for as long as it is supported by Microsoft. (.NET 5 support was dropped in [v0.0.0-beta4](https://github.com/MochiLibraries/Biohazrd/releases/tag/v0.0.0-beta4).)
 
 As for the wrappers you generate with said generators, Biohazrd is not especially opinionated about the version of the .NET Runtime you target, but it does prefer generating C# 10 code. (C# 9 if you ask nicely.)
 
