Skip to content

Commit a0cde6b

Browse files
aleks-ivanovaleks-ivanov
committed
Merge branch 'main' into feature/codeql
2 parents 875b003 + 7b4ce1d commit a0cde6b

34 files changed

+721
-94
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ dotnet_style_qualification_for_method = false:error
244244
dotnet_style_qualification_for_property = false:error
245245

246246
dotnet_style_readonly_field = true:error
247-
dotnet_style_require_accessibility_modifiers = always:error
247+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:error
248248

249249
###############################################################################
250250
# Set dotnet style options to:

‎.github/workflows/ci.yml‎

Lines changed: 41 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ jobs:
2828
./artifacts/pkg/**/*
2929
./artifacts/tst/**/*
3030
if-no-files-found: error
31-
linux-x64:
32-
runs-on: ${{ matrix.os }}-latest
31+
windows-arm64:
32+
runs-on: ${{ matrix.os }}-11-arm
3333
strategy:
3434
matrix:
35-
architecture: [ x64 ]
35+
architecture: [ arm64 ]
3636
configuration: [ debug, release ]
37-
os: [ ubuntu ]
37+
os: [ windows ]
3838
steps:
3939
- uses: actions/checkout@v4
40-
- run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
41-
shell: bash
40+
- run: ./scripts/cibuild.cmd -configuration ${{ matrix.configuration }} -architecture ${{ matrix.architecture }}
41+
shell: cmd
4242
- uses: actions/upload-artifact@v4
4343
with:
4444
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
@@ -48,13 +48,13 @@ jobs:
4848
./artifacts/pkg/**/*
4949
./artifacts/tst/**/*
5050
if-no-files-found: error
51-
macos-arm64:
51+
linux-x64:
5252
runs-on: ${{ matrix.os }}-latest
5353
strategy:
5454
matrix:
55-
architecture: [ arm64 ]
55+
architecture: [ x64 ]
5656
configuration: [ debug, release ]
57-
os: [ macos ]
57+
os: [ ubuntu ]
5858
steps:
5959
- uses: actions/checkout@v4
6060
- run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
@@ -68,97 +68,79 @@ jobs:
6868
./artifacts/pkg/**/*
6969
./artifacts/tst/**/*
7070
if-no-files-found: error
71-
build-nuget-preview:
72-
runs-on: windows-latest
71+
linux-arm64:
72+
runs-on: ${{ matrix.os }}-24.04-arm
73+
strategy:
74+
matrix:
75+
architecture: [ arm64 ]
76+
configuration: [ debug, release ]
77+
os: [ ubuntu ]
7378
steps:
7479
- uses: actions/checkout@v4
75-
- run: ./scripts/cibuild.cmd -configuration release -architecture x64
76-
shell: cmd
77-
env:
78-
EXCLUDE_RUN_ID_FROM_PACKAGE: true
79-
EXCLUDE_SUFFIX_FROM_VERSION: false
80+
- run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
81+
shell: bash
8082
- uses: actions/upload-artifact@v4
8183
with:
82-
name: nuget_preview
84+
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
8385
path: |
8486
./artifacts/bin/**/*
8587
./artifacts/log/**/*
8688
./artifacts/pkg/**/*
8789
./artifacts/tst/**/*
8890
if-no-files-found: error
89-
sign-nuget-preview:
90-
runs-on: windows-latest
91-
if: ${{ github.event_name == 'push' }}
92-
needs: [ build-nuget-preview ]
93-
permissions:
94-
id-token: write
95-
steps:
96-
- uses: actions/checkout@v4
97-
- uses: actions/download-artifact@v4
98-
with:
99-
name: nuget_preview
100-
path: ./artifacts
101-
- uses: actions/setup-dotnet@v4
102-
with:
103-
global-json-file: ./global.json
104-
- run: dotnet tool install --tool-path ./artifacts/tools sign --version 0.9.1-beta.24170.3
105-
- 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@v4
107-
with:
108-
name: sign_nuget_preview
109-
path: |
110-
./artifacts/pkg/**/*
111-
if-no-files-found: error
112-
build-nuget-release:
113-
runs-on: windows-latest
91+
macos-arm64:
92+
runs-on: ${{ matrix.os }}-latest
93+
strategy:
94+
matrix:
95+
architecture: [ arm64 ]
96+
configuration: [ debug, release ]
97+
os: [ macos ]
11498
steps:
11599
- uses: actions/checkout@v4
116-
- run: ./scripts/cibuild.cmd -configuration release -architecture x64
117-
shell: cmd
118-
env:
119-
EXCLUDE_RUN_ID_FROM_PACKAGE: true
120-
EXCLUDE_SUFFIX_FROM_VERSION: true
100+
- run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
101+
shell: bash
121102
- uses: actions/upload-artifact@v4
122103
with:
123-
name: nuget_release
104+
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
124105
path: |
125106
./artifacts/bin/**/*
126107
./artifacts/log/**/*
127108
./artifacts/pkg/**/*
128109
./artifacts/tst/**/*
129110
if-no-files-found: error
130-
sign-nuget-release:
111+
sign-nuget:
131112
runs-on: windows-latest
132113
if: ${{ github.event_name == 'push' }}
133-
needs: [ build-nuget-release ]
114+
needs: [ windows-x64, windows-arm64, linux-x64, linux-arm64, macos-arm64 ]
134115
permissions:
135116
id-token: write
136117
steps:
137118
- uses: actions/checkout@v4
138119
- uses: actions/download-artifact@v4
139120
with:
140-
name: nuget_release
121+
merge-multiple: true
141122
path: ./artifacts
123+
pattern: "./artifacts/pkg/Release/**/*"
142124
- uses: actions/setup-dotnet@v4
143125
with:
144126
global-json-file: ./global.json
145127
- run: dotnet tool install --tool-path ./artifacts/tools sign --version 0.9.1-beta.24170.3
146128
- 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 }}"
147129
- uses: actions/upload-artifact@v4
148130
with:
149-
name: sign_nuget_release
131+
name: sign_nuget
150132
path: |
151-
./artifacts/pkg/**/*
133+
./artifacts/pkg/Release/*
152134
if-no-files-found: error
153135
publish-nightlies-azure:
154136
runs-on: ubuntu-latest
155137
if: ${{ github.event_name == 'push' }}
156-
needs: [ windows-x64, linux-x64, macos-arm64, sign-nuget-preview, sign-nuget-release ]
138+
needs: [ sign-nuget ]
157139
steps:
158140
- uses: actions/download-artifact@v4
159141
with:
160-
name: windows_release_x64
161-
path: ./artifacts
142+
name: sign_nuget
143+
path: ./artifacts/pkg
162144
- uses: actions/setup-dotnet@v4
163145
with:
164146
dotnet-version: '8.0.x'
@@ -169,12 +151,12 @@ jobs:
169151
publish-nightlies-github:
170152
runs-on: ubuntu-latest
171153
if: false
172-
needs: [ windows-x64, linux-x64, macos-arm64, sign-nuget-preview, sign-nuget-release ]
154+
needs: [ sign-nuget ]
173155
steps:
174156
- uses: actions/download-artifact@v4
175157
with:
176-
name: windows_release_x64
177-
path: ./artifacts
158+
name: sign_nuget
159+
path: ./artifacts/pkg
178160
- uses: actions/setup-dotnet@v4
179161
with:
180162
dotnet-version: '8.0.x'

‎Directory.Packages.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<!-- Package versions for package references across all projects -->
1414
<ItemGroup>
1515
<PackageVersion Include="libLLVM" Version="20.1.2" />
16-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
17-
<PackageVersion Include="NUnit" Version="4.1.0" />
18-
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
17+
<PackageVersion Include="NUnit" Version="4.4.0" />
18+
<PackageVersion Include="NUnit3TestAdapter" Version="5.1.0" />
1919
</ItemGroup>
2020

2121
</Project>

‎global.json‎

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

‎samples/KaleidoscopeTutorial/Chapter3/Kaleidoscope/Kaleidoscope.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
</PropertyGroup>
66
</Project>

‎samples/KaleidoscopeTutorial/Chapter3/KaleidoscopeLLVM/KaleidoscopeLLVM.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎samples/KaleidoscopeTutorial/Chapter4/Kaleidoscope/Kaleidoscope.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
</PropertyGroup>
66
</Project>

‎samples/KaleidoscopeTutorial/Chapter4/KaleidoscopeLLVM/KaleidoscopeLLVM.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎samples/KaleidoscopeTutorial/Chapter5/Kaleidoscope/Kaleidoscope.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
</PropertyGroup>
66
</Project>

‎samples/KaleidoscopeTutorial/Chapter5/KaleidoscopeLLVM/KaleidoscopeLLVM.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)