Skip to content

Commit 646034e

Browse files
tannergoodingtannergooding
authored
Merge pull request #463 from tannergooding/main
Updating the repo to target the latest .NET 8 preview
2 parents cf181a1 + 533fe70 commit 646034e

File tree

170 files changed

+1671
-1529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+1671
-1529
lines changed

Diff for: ‎.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ end_of_line = lf
2121
insert_final_newline = true
2222
indent_style = space
2323
indent_size = 4
24+
spelling_error_severity = information
25+
spelling_exclusion_path = exclusion.dic
26+
spelling_languages = en-us
2427
tab_width = 4
2528
trim_trailing_whitespace = true
2629

Diff for: ‎ClangSharp.sln

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1414
Directory.Build.props = Directory.Build.props
1515
Directory.Build.targets = Directory.Build.targets
1616
Directory.Packages.props = Directory.Packages.props
17+
exclusion.dic = exclusion.dic
1718
global.json = global.json
1819
LICENSE.md = LICENSE.md
1920
NOTICE.md = NOTICE.md

Diff for: ‎Directory.Build.props

+7-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- Default settings that explicitly differ from the Sdk.props defaults -->
2121
<PropertyGroup>
2222
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
23-
<AnalysisLevel>preview</AnalysisLevel>
23+
<AnalysisLevel>preview-all</AnalysisLevel>
2424
<BaseIntermediateOutputPath>$(BaseArtifactsPath)obj/$(BaseArtifactsPathSuffix)/</BaseIntermediateOutputPath>
2525
<DebugType>embedded</DebugType>
2626
<EnableDefaultNoneItems>false</EnableDefaultNoneItems>
@@ -42,10 +42,15 @@
4242
<BaseOutputPath>$(BaseArtifactsPath)bin/$(BaseArtifactsPathSuffix)/</BaseOutputPath>
4343
<Company>.NET Foundation</Company>
4444
<ContinuousIntegrationBuild Condition="'$(GITHUB_RUN_ID)' != ''">true</ContinuousIntegrationBuild>
45+
<EnableAotAnalyzer>true</EnableAotAnalyzer>
46+
<EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
47+
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
48+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
4549
<PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
50+
<PackageValidationBaselineVersion>16.0.0</PackageValidationBaselineVersion>
4651
<Product>ClangSharp</Product>
4752
<RootNamespace>ClangSharp</RootNamespace>
48-
<VersionPrefix>16.0.0</VersionPrefix>
53+
<VersionPrefix>16.0.1</VersionPrefix>
4954
<VersionSuffix Condition="'$(EXCLUDE_SUFFIX_FROM_VERSION)' != 'true'">rc1</VersionSuffix>
5055
<VersionSuffix Condition="'$(GITHUB_EVENT_NAME)' == 'pull_request'">pr</VersionSuffix>
5156
</PropertyGroup>

Diff for: ‎Directory.Build.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<!-- Settings that append the existing setting value -->
1414
<PropertyGroup>
15-
<NoWarn>$(NoWarn);AD0001</NoWarn>
15+
<NoWarn>$(NoWarn)</NoWarn>
1616
</PropertyGroup>
1717

1818
<!-- Settings that are only set for CI builds -->

Diff for: ‎Directory.Packages.props

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<PackageVersion Include="libClangSharp" Version="16.0.6" />
1717
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
1818
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
19-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
2019
<PackageVersion Include="NUnit" Version="3.13.3" />
2120
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
2221
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />

Diff for: ‎exclusion.dic

+223
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,223 @@
1+
accum
2+
addr
3+
addrspace
4+
alignm
5+
alignof
6+
arglist
7+
argv
8+
assoc
9+
assocs
10+
attrs
11+
autorelease
12+
autoreleased
13+
bicc
14+
bitwidth
15+
blittability
16+
builtin
17+
bycopy
18+
byref
19+
callconv
20+
cdecl
21+
clangsharp
22+
cmse
23+
coawait
24+
comdat
25+
constexpr
26+
convs
27+
coreturn
28+
coyield
29+
cref
30+
cset
31+
csharp
32+
ctors
33+
cxxmd
34+
cx_attrkind_a
35+
cx_attrkind_amdgpu
36+
cx_attrkind_arm
37+
cx_attrkind_avr
38+
cx_attrkind_bpf
39+
cx_attrkind_btf
40+
cx_attrkind_c
41+
cx_attrkind_cf
42+
cx_attrkind_cfi
43+
cx_attrkind_cmsens
44+
cx_attrkind_cpu
45+
cx_attrkind_cuda
46+
cx_attrkind_dll
47+
cx_attrkind_enforcetcb
48+
cx_attrkind_firsthlsl
49+
cx_attrkind_firstparameterabi
50+
cx_attrkind_gnu
51+
cx_attrkind_hip
52+
cx_attrkind_hlsl
53+
cx_attrkind_i
54+
cx_attrkind_ib
55+
cx_attrkind_lasthlsl
56+
cx_attrkind_lastparameterabi
57+
cx_attrkind_lto
58+
cx_attrkind_mig
59+
cx_attrkind_ms
60+
cx_attrkind_msabi
61+
cx_attrkind_ns
62+
cx_attrkind_objc
63+
cx_attrkind_objcgc
64+
cx_attrkind_objcns
65+
cx_attrkind_omp
66+
cx_attrkind_opencl
67+
cx_attrkind_os
68+
cx_attrkind_pragmaclangbss
69+
cx_attrkind_riscv
70+
cx_attrkind_s
71+
cx_attrkind_swiftobjc
72+
cx_attrkind_sycl
73+
cx_attrkind_sysvabi
74+
cx_attrkind_tls
75+
cx_attrkind_trivialabi
76+
cx_attrkind_u
77+
cx_attrkind_x
78+
cx_ck_blockpointertoobjc
79+
cx_ck_inttoocl
80+
cx_ck_objc
81+
cx_ck_zerotoocl
82+
cx_cr_objc
83+
cx_declkind_cxx
84+
cx_declkind_externc
85+
cx_declkind_firstcxx
86+
cx_declkind_firstobjc
87+
cx_declkind_hlsl
88+
cx_declkind_lastcxx
89+
cx_declkind_lastobjc
90+
cx_declkind_ms
91+
cx_declkind_objc
92+
cx_declkind_omp
93+
cx_sc_opencl
94+
cx_stmtclass_c
95+
cx_stmtclass_cuda
96+
cx_stmtclass_cxx
97+
cx_stmtclass_firstcxx
98+
cx_stmtclass_firstomp
99+
cx_stmtclass_gcc
100+
cx_stmtclass_gnu
101+
cx_stmtclass_lastcxx
102+
cx_stmtclass_lastomp
103+
cx_stmtclass_ms
104+
cx_stmtclass_objc
105+
cx_stmtclass_omp
106+
cx_stmtclass_seh
107+
cx_stmtclass_sycl
108+
cx_stmtclass_va
109+
cx_typeclass_btf
110+
cx_typeclass_l
111+
cx_typeclass_objc
112+
cx_typeclass_r
113+
cx_uett_openmp
114+
decls
115+
declspec
116+
decltype
117+
defs
118+
depobj
119+
descs
120+
diag
121+
diags
122+
disp
123+
dont
124+
dtor
125+
edouble
126+
ehalf
127+
entrypoint
128+
enums
129+
equad
130+
equatable
131+
esingle
132+
exprs
133+
fastcall
134+
fnptr
135+
funcs
136+
gnuxx
137+
imag
138+
impl
139+
impls
140+
inits
141+
inlined
142+
inlining
143+
inout
144+
intptr
145+
ivars
146+
libclang
147+
librarypath
148+
llvm
149+
locs
150+
manglings
151+
memberwise
152+
membuffer
153+
memcpy
154+
memset
155+
mips
156+
nand
157+
noattr
158+
noexcept
159+
nothrow
160+
nrvo
161+
nullptr
162+
nunit
163+
objc
164+
oneway
165+
opencl
166+
parens
167+
parm
168+
pinvoke
169+
pointee
170+
ptrdiff
171+
readwrite
172+
redecl
173+
redeclarable
174+
relro
175+
remappings
176+
rodata
177+
setlasterror
178+
setslastsystemerror
179+
simd
180+
stackalloc
181+
stdcall
182+
stmt
183+
stmts
184+
streamin
185+
streamout
186+
stringify
187+
subminor
188+
subst
189+
suppressgctransition
190+
taskgroup
191+
taskwait
192+
taskyield
193+
thiscall
194+
thunks
195+
trylock
196+
typeid
197+
typename
198+
typestate
199+
uintptr
200+
undeduced
201+
unix
202+
unmarshal
203+
unscoped
204+
usings
205+
usr_objc
206+
uuid
207+
uuidof
208+
uuids
209+
uwtable
210+
varargs
211+
vbase
212+
vbases
213+
vtbl
214+
vtblindex
215+
vtbls
216+
vtor
217+
wcslen
218+
weakref
219+
winapi
220+
wsgct
221+
wsle
222+
xdata
223+
xunit

Diff for: ‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "7.0.100",
3+
"version": "8.0.100-preview",
44
"allowPrerelease": true,
55
"rollForward": "latestFeature"
66
}

Diff for: ‎scripts/build.ps1

+1-2
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,7 @@ try {
172172
$DotNetInstallDirectory = Join-Path -Path $ArtifactsDir -ChildPath "dotnet"
173173
Create-Directory -Path $DotNetInstallDirectory
174174

175-
& $DotNetInstallScript -Channel 6.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture
176-
& $DotNetInstallScript -Channel 7.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture
175+
& $DotNetInstallScript -Channel 8.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture
177176

178177
$env:PATH="$DotNetInstallDirectory;$env:PATH"
179178
}

Diff for: ‎scripts/build.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,7 @@ if [[ ! -z "$architecture" ]]; then
204204
DotNetInstallDirectory="$ArtifactsDir/dotnet"
205205
CreateDirectory "$DotNetInstallDirectory"
206206

207-
. "$DotNetInstallScript" --channel 6.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
208-
. "$DotNetInstallScript" --channel 7.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
207+
. "$DotNetInstallScript" --channel 8.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
209208

210209
PATH="$DotNetInstallDirectory:$PATH:"
211210
fi

Diff for: ‎sources/ClangSharp.Interop/ClangSharp.Interop.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33

44
<PropertyGroup>
5-
<TargetFrameworks>net6.0;net7.0;netstandard2.0</TargetFrameworks>
5+
<NoWarn>$(NoWarn);CA1069</NoWarn>
6+
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
67
</PropertyGroup>
78

89
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
9-
<Compile Remove="Extensions/clang.ResolveLibrary.cs" />
10+
<Compile Remove="clang.cs" />
1011
<InternalsVisibleTo Include="ClangSharp" Key="$(AssemblyOriginatorPublicKey)" />
1112
<InternalsVisibleTo Include="ClangSharp.PInvokeGenerator" Key="$(AssemblyOriginatorPublicKey)" />
1213
</ItemGroup>

Diff for: ‎sources/ClangSharp.Interop/CompatibilitySuppressions.xml

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<Suppression>
4+
<DiagnosticId>CP0002</DiagnosticId>
5+
<Target>M:ClangSharp.Interop.clang.add_ResolveLibrary(System.Runtime.InteropServices.DllImportResolver)</Target>
6+
<Left>lib/net6.0/ClangSharp.Interop.dll</Left>
7+
<Right>lib/netstandard2.0/ClangSharp.Interop.dll</Right>
8+
<IsBaselineSuppression>true</IsBaselineSuppression>
9+
</Suppression>
10+
<Suppression>
11+
<DiagnosticId>CP0002</DiagnosticId>
12+
<Target>M:ClangSharp.Interop.clang.remove_ResolveLibrary(System.Runtime.InteropServices.DllImportResolver)</Target>
13+
<Left>lib/net6.0/ClangSharp.Interop.dll</Left>
14+
<Right>lib/netstandard2.0/ClangSharp.Interop.dll</Right>
15+
<IsBaselineSuppression>true</IsBaselineSuppression>
16+
</Suppression>
17+
<Suppression>
18+
<DiagnosticId>CP0002</DiagnosticId>
19+
<Target>M:ClangSharp.Interop.CXCodeCompleteResults.GetContaininerKind(System.Boolean@)</Target>
20+
<Left>lib/net6.0/ClangSharp.Interop.dll</Left>
21+
<Right>lib/netstandard2.0/ClangSharp.Interop.dll</Right>
22+
<IsBaselineSuppression>true</IsBaselineSuppression>
23+
</Suppression>
24+
<Suppression>
25+
<DiagnosticId>CP0002</DiagnosticId>
26+
<Target>M:ClangSharp.Interop.clang.add_ResolveLibrary(System.Runtime.InteropServices.DllImportResolver)</Target>
27+
<Left>lib/net7.0/ClangSharp.Interop.dll</Left>
28+
<Right>lib/netstandard2.0/ClangSharp.Interop.dll</Right>
29+
<IsBaselineSuppression>true</IsBaselineSuppression>
30+
</Suppression>
31+
<Suppression>
32+
<DiagnosticId>CP0002</DiagnosticId>
33+
<Target>M:ClangSharp.Interop.clang.remove_ResolveLibrary(System.Runtime.InteropServices.DllImportResolver)</Target>
34+
<Left>lib/net7.0/ClangSharp.Interop.dll</Left>
35+
<Right>lib/netstandard2.0/ClangSharp.Interop.dll</Right>
36+
<IsBaselineSuppression>true</IsBaselineSuppression>
37+
</Suppression>
38+
<Suppression>
39+
<DiagnosticId>CP0002</DiagnosticId>
40+
<Target>M:ClangSharp.Interop.CXCodeCompleteResults.GetContaininerKind(System.Boolean@)</Target>
41+
<Left>lib/net7.0/ClangSharp.Interop.dll</Left>
42+
<Right>lib/netstandard2.0/ClangSharp.Interop.dll</Right>
43+
<IsBaselineSuppression>true</IsBaselineSuppression>
44+
</Suppression>
45+
<Suppression>
46+
<DiagnosticId>CP0002</DiagnosticId>
47+
<Target>M:ClangSharp.Interop.CXCodeCompleteResults.GetContaininerKind(out bool)</Target>
48+
<Left>lib/netstandard2.0/ClangSharp.Interop.dll</Left>
49+
<Right>lib/netstandard2.0/ClangSharp.Interop.dll</Right>
50+
</Suppression>
51+
<Suppression>
52+
<DiagnosticId>CP0002</DiagnosticId>
53+
<Target>M:ClangSharp.Interop.CXCodeCompleteResults.GetContaininerKind(System.Boolean@)</Target>
54+
<Left>lib/netstandard2.0/ClangSharp.Interop.dll</Left>
55+
<Right>lib/netstandard2.0/ClangSharp.Interop.dll</Right>
56+
<IsBaselineSuppression>true</IsBaselineSuppression>
57+
</Suppression>
58+
</Suppressions>

0 commit comments

Comments
 (0)