Skip to content

Commit ed54b17

Browse files
tannergoodingtannergooding
authored
Merge pull request dotnet#224 from tannergooding/main
Updating to LLVM v18.1
2 parents 5562197 + e13acda commit ed54b17

File tree

192 files changed

+695
-986
lines changed

Some content is hidden

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

192 files changed

+695
-986
lines changed

‎.github/workflows/ci.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
configuration: [ debug, release ]
1717
os: [ windows ]
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- run: ./scripts/cibuild.cmd -configuration ${{ matrix.configuration }} -architecture ${{ matrix.architecture }}
2121
shell: cmd
22-
- uses: actions/upload-artifact@v3
22+
- uses: actions/upload-artifact@v4
2323
with:
2424
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
2525
path: |
@@ -36,10 +36,10 @@ jobs:
3636
configuration: [ debug, release ]
3737
os: [ ubuntu ]
3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040
- run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
4141
shell: bash
42-
- uses: actions/upload-artifact@v3
42+
- uses: actions/upload-artifact@v4
4343
with:
4444
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
4545
path: |
@@ -56,10 +56,10 @@ jobs:
5656
configuration: [ debug, release ]
5757
os: [ macos ]
5858
steps:
59-
- uses: actions/checkout@v3
59+
- uses: actions/checkout@v4
6060
- run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
6161
shell: bash
62-
- uses: actions/upload-artifact@v3
62+
- uses: actions/upload-artifact@v4
6363
with:
6464
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
6565
path: |
@@ -71,13 +71,13 @@ jobs:
7171
build-nuget-preview:
7272
runs-on: windows-latest
7373
steps:
74-
- uses: actions/checkout@v3
74+
- uses: actions/checkout@v4
7575
- run: ./scripts/cibuild.cmd -configuration release -architecture x64
7676
shell: cmd
7777
env:
7878
EXCLUDE_RUN_ID_FROM_PACKAGE: true
7979
EXCLUDE_SUFFIX_FROM_VERSION: false
80-
- uses: actions/upload-artifact@v3
80+
- uses: actions/upload-artifact@v4
8181
with:
8282
name: nuget_preview
8383
path: |
@@ -93,17 +93,17 @@ jobs:
9393
permissions:
9494
id-token: write
9595
steps:
96-
- uses: actions/checkout@v3
97-
- uses: actions/download-artifact@v3
96+
- uses: actions/checkout@v4
97+
- uses: actions/download-artifact@v4
9898
with:
9999
name: nuget_preview
100100
path: ./artifacts
101-
- uses: actions/setup-dotnet@v3
101+
- uses: actions/setup-dotnet@v4
102102
with:
103103
global-json-file: ./global.json
104104
- run: dotnet tool install --tool-path ./artifacts/tools sign --version 0.9.1-beta.24170.3
105105
- run: ./artifacts/tools/sign code azure-key-vault "**/*.nupkg" --timestamp-url "http://timestamp.digicert.com" --base-directory "${{ github.workspace }}/artifacts/pkg" --file-list "${{ github.workspace }}/scripts/SignClientFileList.txt" --publisher-name ".NET Foundation" --description "LLVMSharp" --description-url "https://github.com/dotnet/llvmsharp" --azure-key-vault-certificate "${{ secrets.SC_KEY_VAULT_CERTIFICATE_ID }}" --azure-key-vault-client-id "${{ secrets.SC_AZURE_CLIENT_ID }}" --azure-key-vault-client-secret "${{ secrets.SC_AZURE_CLIENT_SECRET }}" --azure-key-vault-tenant-id "${{ secrets.SC_AZURE_TENANT_ID }}" --azure-key-vault-url "${{ secrets.SC_KEY_VAULT_URL }}"
106-
- uses: actions/upload-artifact@v3
106+
- uses: actions/upload-artifact@v4
107107
with:
108108
name: sign_nuget_preview
109109
path: |
@@ -112,13 +112,13 @@ jobs:
112112
build-nuget-release:
113113
runs-on: windows-latest
114114
steps:
115-
- uses: actions/checkout@v3
115+
- uses: actions/checkout@v4
116116
- run: ./scripts/cibuild.cmd -configuration release -architecture x64
117117
shell: cmd
118118
env:
119119
EXCLUDE_RUN_ID_FROM_PACKAGE: true
120120
EXCLUDE_SUFFIX_FROM_VERSION: true
121-
- uses: actions/upload-artifact@v3
121+
- uses: actions/upload-artifact@v4
122122
with:
123123
name: nuget_release
124124
path: |
@@ -134,17 +134,17 @@ jobs:
134134
permissions:
135135
id-token: write
136136
steps:
137-
- uses: actions/checkout@v3
138-
- uses: actions/download-artifact@v3
137+
- uses: actions/checkout@v4
138+
- uses: actions/download-artifact@v4
139139
with:
140140
name: nuget_release
141141
path: ./artifacts
142-
- uses: actions/setup-dotnet@v3
142+
- uses: actions/setup-dotnet@v4
143143
with:
144144
global-json-file: ./global.json
145145
- run: dotnet tool install --tool-path ./artifacts/tools sign --version 0.9.1-beta.24170.3
146146
- run: ./artifacts/tools/sign code azure-key-vault "**/*.nupkg" --timestamp-url "http://timestamp.digicert.com" --base-directory "${{ github.workspace }}/artifacts/pkg" --file-list "${{ github.workspace }}/scripts/SignClientFileList.txt" --publisher-name ".NET Foundation" --description "LLVMSharp" --description-url "https://github.com/dotnet/llvmsharp" --azure-key-vault-certificate "${{ secrets.SC_KEY_VAULT_CERTIFICATE_ID }}" --azure-key-vault-client-id "${{ secrets.SC_AZURE_CLIENT_ID }}" --azure-key-vault-client-secret "${{ secrets.SC_AZURE_CLIENT_SECRET }}" --azure-key-vault-tenant-id "${{ secrets.SC_AZURE_TENANT_ID }}" --azure-key-vault-url "${{ secrets.SC_KEY_VAULT_URL }}"
147-
- uses: actions/upload-artifact@v3
147+
- uses: actions/upload-artifact@v4
148148
with:
149149
name: sign_nuget_release
150150
path: |
@@ -155,11 +155,11 @@ jobs:
155155
if: ${{ github.event_name == 'push' }}
156156
needs: [ windows-x64, linux-x64, macos-x64, sign-nuget-preview, sign-nuget-release ]
157157
steps:
158-
- uses: actions/download-artifact@v3
158+
- uses: actions/download-artifact@v4
159159
with:
160160
name: windows_release_x64
161161
path: ./artifacts
162-
- uses: actions/setup-dotnet@v3
162+
- uses: actions/setup-dotnet@v4
163163
with:
164164
dotnet-version: '8.0.x'
165165
source-url: https://pkgs.clangsharp.dev/index.json
@@ -171,11 +171,11 @@ jobs:
171171
if: false
172172
needs: [ windows-x64, linux-x64, macos-x64, sign-nuget-preview, sign-nuget-release ]
173173
steps:
174-
- uses: actions/download-artifact@v3
174+
- uses: actions/download-artifact@v4
175175
with:
176176
name: windows_release_x64
177177
path: ./artifacts
178-
- uses: actions/setup-dotnet@v3
178+
- uses: actions/setup-dotnet@v4
179179
with:
180180
dotnet-version: '8.0.x'
181181
- run: dotnet nuget push "./artifacts/pkg/Release/*.nupkg" --source https://nuget.pkg.github.com/dotnet/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<PackageValidationBaselineVersion>16.0.0</PackageValidationBaselineVersion>
4848
<Product>LLVMSharp</Product>
4949
<RootNamespace>LLVMSharp</RootNamespace>
50-
<VersionPrefix>16.0.0</VersionPrefix>
50+
<VersionPrefix>18.1.0</VersionPrefix>
5151
<VersionSuffix Condition="'$(EXCLUDE_SUFFIX_FROM_VERSION)' != 'true'">rc1</VersionSuffix>
5252
<VersionSuffix Condition="'$(GITHUB_EVENT_NAME)' == 'pull_request'">pr</VersionSuffix>
5353
</PropertyGroup>

‎Directory.Packages.props

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@
1212

1313
<!-- Package versions for package references across all projects -->
1414
<ItemGroup>
15-
<PackageVersion Include="libLLVM" Version="16.0.6" />
16-
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
17-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
18-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
19-
<PackageVersion Include="NUnit" Version="3.13.3" />
15+
<PackageVersion Include="libLLVM" Version="18.1.3.1" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
17+
<PackageVersion Include="NUnit" Version="4.1.0" />
2018
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
21-
<PackageVersion Include="System.Memory" Version="4.5.5" />
2219
</ItemGroup>
2320

2421
</Project>

‎LLVMSharp.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.win-x64", "
8181
packages\libLLVM\libLLVM.runtime.win-x64\libLLVM.runtime.win-x64.nuspec = packages\libLLVM\libLLVM.runtime.win-x64\libLLVM.runtime.win-x64.nuspec
8282
EndProjectSection
8383
EndProject
84-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.win-x86", "libLLVM.runtime.win-x86", "{540AB7F4-29FD-462A-8791-259764FD4950}"
85-
ProjectSection(SolutionItems) = preProject
86-
packages\libLLVM\libLLVM.runtime.win-x86\libLLVM.runtime.win-x86.nuspec = packages\libLLVM\libLLVM.runtime.win-x86\libLLVM.runtime.win-x86.nuspec
87-
EndProjectSection
88-
EndProject
8984
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.win-arm64", "libLLVM.runtime.win-arm64", "{19DB05E9-59B6-45E9-B47D-62913F7DF9A8}"
9085
ProjectSection(SolutionItems) = preProject
9186
packages\libLLVM\libLLVM.runtime.win-arm64\libLLVM.runtime.win-arm64.nuspec = packages\libLLVM\libLLVM.runtime.win-arm64\libLLVM.runtime.win-arm64.nuspec
@@ -140,7 +135,6 @@ Global
140135
{16539CB8-8AC7-4AD0-9D54-8EE615B2FCF3} = {9D46FF1C-E09F-4063-A97D-C09F26310B67}
141136
{D4550E5E-9485-4480-B2B6-9503EEC935BF} = {9D46FF1C-E09F-4063-A97D-C09F26310B67}
142137
{E785DDD0-B9CD-4412-8A3C-4E65C601168C} = {9D46FF1C-E09F-4063-A97D-C09F26310B67}
143-
{540AB7F4-29FD-462A-8791-259764FD4950} = {9D46FF1C-E09F-4063-A97D-C09F26310B67}
144138
{19DB05E9-59B6-45E9-B47D-62913F7DF9A8} = {9D46FF1C-E09F-4063-A97D-C09F26310B67}
145139
{CEA0F0C9-DF25-446B-8F55-FB629BD1D3E6} = {62B5C536-C224-4EE1-972F-05F732B5980B}
146140
{706334B8-BB91-49A4-BC9C-DFFDF3DCD770} = {E8ADE5A7-4363-43B7-B104-6B0E5510CAF0}

‎packages/libLLVM/libLLVM.runtime.linux-arm64/libLLVM.runtime.linux-arm64.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libLLVM.runtime.linux-arm64</id>
5-
<version>16.0.6</version>
5+
<version>18.1.3</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>
99
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
1010
<projectUrl>https://github.com/dotnet/llvmsharp</projectUrl>
1111
<description>linux arm64 native library for libLLVM.</description>
1212
<copyright>Copyright © LLVM Project</copyright>
13-
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-16.0.6" />
13+
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
1414
</metadata>
1515
<files>
1616
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />

‎packages/libLLVM/libLLVM.runtime.linux-x64/libLLVM.runtime.linux-x64.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libLLVM.runtime.linux-x64</id>
5-
<version>16.0.6</version>
5+
<version>18.1.3</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>
99
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
1010
<projectUrl>https://github.com/dotnet/llvmsharp</projectUrl>
1111
<description>linux x64 native library for libLLVM.</description>
1212
<copyright>Copyright © LLVM Project</copyright>
13-
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-16.0.6" />
13+
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
1414
</metadata>
1515
<files>
1616
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />

‎packages/libLLVM/libLLVM.runtime.osx-arm64/libLLVM.runtime.osx-arm64.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libLLVM.runtime.osx-arm64</id>
5-
<version>16.0.6</version>
5+
<version>18.1.3</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>
99
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
1010
<projectUrl>https://github.com/dotnet/llvmsharp</projectUrl>
1111
<description>osx arm64 native library for libLLVM.</description>
1212
<copyright>Copyright © LLVM Project</copyright>
13-
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-16.0.6" />
13+
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
1414
</metadata>
1515
<files>
1616
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />

‎packages/libLLVM/libLLVM.runtime.osx-x64/libLLVM.runtime.osx-x64.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libLLVM.runtime.osx-x64</id>
5-
<version>16.0.6</version>
5+
<version>18.1.3</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>
99
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
1010
<projectUrl>https://github.com/dotnet/llvmsharp</projectUrl>
1111
<description>osx x64 native library for libLLVM.</description>
1212
<copyright>Copyright © LLVM Project</copyright>
13-
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-16.0.6" />
13+
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
1414
</metadata>
1515
<files>
1616
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />

‎packages/libLLVM/libLLVM.runtime.win-arm64/libLLVM.runtime.win-arm64.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libLLVM.runtime.win-arm64</id>
5-
<version>16.0.6</version>
5+
<version>18.1.3.1</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>
99
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
1010
<projectUrl>https://github.com/dotnet/llvmsharp</projectUrl>
1111
<description>win arm64 native library for libLLVM.</description>
1212
<copyright>Copyright © LLVM Project</copyright>
13-
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-16.0.6" />
13+
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
1414
</metadata>
1515
<files>
1616
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />

‎packages/libLLVM/libLLVM.runtime.win-x64/libLLVM.runtime.win-x64.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libLLVM.runtime.win-x64</id>
5-
<version>16.0.6</version>
5+
<version>18.1.3.1</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>
99
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
1010
<projectUrl>https://github.com/dotnet/llvmsharp</projectUrl>
1111
<description>win x64 native library for libLLVM.</description>
1212
<copyright>Copyright © LLVM Project</copyright>
13-
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-16.0.6" />
13+
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
1414
</metadata>
1515
<files>
1616
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />

‎packages/libLLVM/libLLVM.runtime.win-x86/libLLVM.runtime.win-x86.nuspec

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎packages/libLLVM/libLLVM/libLLVM.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libLLVM</id>
5-
<version>16.0.6</version>
5+
<version>18.1.3.1</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>
99
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
1010
<projectUrl>https://github.com/dotnet/llvmsharp</projectUrl>
1111
<description>Multi-platform native library for libLLVM.</description>
1212
<copyright>Copyright © LLVM Project</copyright>
13-
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-16.0.6" />
13+
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
1414
<dependencies>
1515
<group targetFramework=".NETStandard2.0" />
1616
</dependencies>

‎packages/libLLVM/libLLVM/runtime.json

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,32 @@
22
"runtimes": {
33
"linux-arm64": {
44
"libLLVM": {
5-
"libLLVM.runtime.linux-arm64": "16.0.6"
5+
"libLLVM.runtime.linux-arm64": "18.1.3"
66
}
77
},
88
"linux-x64": {
99
"libLLVM": {
10-
"libLLVM.runtime.linux-x64": "16.0.6"
10+
"libLLVM.runtime.linux-x64": "18.1.3"
1111
}
1212
},
1313
"osx-arm64": {
1414
"libLLVM": {
15-
"libLLVM.runtime.osx-arm64": "16.0.6"
15+
"libLLVM.runtime.osx-arm64": "18.1.3"
1616
}
1717
},
1818
"osx-x64": {
1919
"libLLVM": {
20-
"libLLVM.runtime.osx-x64": "16.0.6"
20+
"libLLVM.runtime.osx-x64": "18.1.3"
2121
}
2222
},
2323
"win-arm64": {
2424
"libLLVM": {
25-
"libLLVM.runtime.win-arm64": "16.0.6"
25+
"libLLVM.runtime.win-arm64": "18.1.3.1"
2626
}
2727
},
2828
"win-x64": {
2929
"libLLVM": {
30-
"libLLVM.runtime.win-x64": "16.0.6"
31-
}
32-
},
33-
"win-x86": {
34-
"libLLVM": {
35-
"libLLVM.runtime.win-x86": "16.0.6"
30+
"libLLVM.runtime.win-x64": "18.1.3.1"
3631
}
3732
}
3833
}

0 commit comments

Comments
 (0)