Skip to content

Commit dd180cd

Browse files
committed
merge no-xamarin into main, in preparation for 3.0
2 parents 75275e6 + 74a0ff2 commit dd180cd

File tree

136 files changed

+1183
-11773
lines changed

Some content is hidden

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

136 files changed

+1183
-11773
lines changed

.github/workflows/dotnet.yml

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ name: .NET
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ main ]
88

99
jobs:
1010
build:
1111

1212
strategy:
1313
matrix:
14-
# TODO want macos-latest here too, but the build currently fails there
15-
os: [windows-latest]
14+
# TODO want Linux here too, but the apple workloads aren't available there.
15+
os: [windows-2025, macos-15]
1616

1717
runs-on: ${{ matrix.os }}
1818

@@ -21,39 +21,23 @@ jobs:
2121
with:
2222
fetch-depth: 0
2323
path: "SQLitePCL.raw"
24-
- uses: actions/checkout@v2
25-
with:
26-
repository: ericsink/cb
27-
path: "cb"
28-
- name: "Set up Java: 11"
29-
uses: actions/setup-java@v1
30-
with:
31-
java-version: 11
32-
- name: Setup Android SDK 27, 28, 29 and 30
33-
uses: android-actions/setup-android@v3
24+
- name: Setup .NET
25+
uses: actions/setup-dotnet@v4
3426
with:
35-
cmdline-tools-version: 9123335
36-
- run: sdkmanager tools "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30"
37-
- name: Setup .NET 6
38-
uses: actions/setup-dotnet@v1
39-
with:
40-
dotnet-version: 6.0.x
41-
include-prerelease: true
27+
dotnet-version: 9.0.x
4228
- name: Install workload ios
4329
run: dotnet workload install ios
4430
- name: Install workload maccatalyst
4531
run: dotnet workload install maccatalyst
46-
- name: Install workload android
47-
run: dotnet workload install android
4832
- name: Install workload tvos
4933
run: dotnet workload install tvos
50-
- name: Setup .NET 3.1
51-
uses: actions/setup-dotnet@v1
52-
with:
53-
dotnet-version: 3.1.x
5434
- name: Install T4
5535
run: dotnet tool install --global dotnet-t4
5636
- name: Build
37+
env:
38+
SG_NUGET_TOKEN: ${{ secrets.SG_NUGET_TOKEN }}
39+
SEE_ACTIVATION_CODE: ${{ secrets.SEE_ACTIVATION_CODE }}
5740
run: |
5841
cd SQLitePCL.raw/build
5942
dotnet run
43+

.github/workflows/pub.yml

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77

88
strategy:
99
matrix:
10-
os: [windows-latest]
10+
os: [windows-2025]
1111

1212
runs-on: ${{ matrix.os }}
1313

@@ -16,39 +16,22 @@ jobs:
1616
with:
1717
fetch-depth: 0
1818
path: "SQLitePCL.raw"
19-
- uses: actions/checkout@v2
20-
with:
21-
repository: ericsink/cb
22-
path: "cb"
23-
- name: "Set up Java: 11"
24-
uses: actions/setup-java@v1
25-
with:
26-
java-version: 11
27-
- name: Setup Android SDK 27, 28, 29 and 30
28-
uses: android-actions/setup-android@v3
19+
- name: Setup .NET
20+
uses: actions/setup-dotnet@v4
2921
with:
30-
cmdline-tools-version: 9123335
31-
- run: sdkmanager tools "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30"
32-
- name: Setup .NET 6
33-
uses: actions/setup-dotnet@v1
34-
with:
35-
dotnet-version: 6.0.x
36-
include-prerelease: true
22+
dotnet-version: 9.0.x
3723
- name: Install workload ios
3824
run: dotnet workload install ios
3925
- name: Install workload maccatalyst
4026
run: dotnet workload install maccatalyst
41-
- name: Install workload android
42-
run: dotnet workload install android
4327
- name: Install workload tvos
4428
run: dotnet workload install tvos
45-
- name: Setup .NET 3.1
46-
uses: actions/setup-dotnet@v1
47-
with:
48-
dotnet-version: 3.1.x
4929
- name: Install T4
5030
run: dotnet tool install --global dotnet-t4
5131
- name: Build
32+
env:
33+
SG_NUGET_TOKEN: ${{ secrets.SG_NUGET_TOKEN }}
34+
SEE_ACTIVATION_CODE: ${{ secrets.SEE_ACTIVATION_CODE }}
5235
run: |
5336
cd SQLitePCL.raw/build
5437
dotnet run

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ project.lock.json
1717
/nupkgs/push.bat
1818
/gen_nuspecs.exe
1919
**/_._
20+
lib_nupkgs/*.nupkg
2021

Directory.Build.props

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<!--This file is automatically generated-->
22
<Project>
33
<PropertyGroup>
4-
<Copyright>Copyright 2014-2023 SourceGear, LLC</Copyright>
4+
<Copyright>Copyright 2014-2025 SourceGear, LLC</Copyright>
55
<Company>SourceGear</Company>
66
<Authors>Eric Sink</Authors>
7-
<Version>2.1.7-pre20231109155839</Version>
8-
<AssemblyVersion>2.1.7.2138</AssemblyVersion>
9-
<FileVersion>2.1.7.2138</FileVersion>
7+
<Version>3.0.0-pre20250729105745</Version>
8+
<AssemblyVersion>3.0.0.2766</AssemblyVersion>
9+
<FileVersion>3.0.0.2766</FileVersion>
1010
<Description>SQLitePCLRaw is a Portable Class Library (PCL) for low-level (raw) access to SQLite</Description>
1111
<ProviderLangVersion>10.0</ProviderLangVersion>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -16,19 +16,20 @@
1616
<RepositoryUrl>https://github.com/ericsink/SQLitePCL.raw</RepositoryUrl>
1717
<RepositoryType>git</RepositoryType>
1818
<PackageOutputPath>$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), 'nupkgs'))</PackageOutputPath>
19-
<cb_bin_path>$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), '..', 'cb', 'bld', 'bin'))</cb_bin_path>
2019
<src_path>$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), 'src'))</src_path>
2120
<pkg_version_for_testing>$(Version)</pkg_version_for_testing>
22-
<depversion_xunit>2.4.1</depversion_xunit>
23-
<depversion_xunit_runner_visualstudio>2.4.1</depversion_xunit_runner_visualstudio>
24-
<depversion_microsoft_net_test_sdk>15.0.0</depversion_microsoft_net_test_sdk>
25-
<tfm_classic_android>monoandroid9.0</tfm_classic_android>
26-
<tfm_classic_ios>xamarin.ios10</tfm_classic_ios>
27-
<tfm_net6_ios>net6.0-ios14.2</tfm_net6_ios>
28-
<tfm_net6_tvos>net6.0-tvos10</tfm_net6_tvos>
29-
<tfm_net6_maccatalyst>net6.0-ios14.0</tfm_net6_maccatalyst>
30-
<tfm_net6_android>net6.0-android</tfm_net6_android>
21+
<lib_e_sqlite3_package_reference_version>3.50.3</lib_e_sqlite3_package_reference_version>
22+
<see_pkg_version_for_testing>3.50.3.1</see_pkg_version_for_testing>
23+
<depversion_xunit>2.6.3</depversion_xunit>
24+
<depversion_xunit_runner_visualstudio>2.5.5</depversion_xunit_runner_visualstudio>
25+
<depversion_microsoft_net_test_sdk>17.8.0</depversion_microsoft_net_test_sdk>
26+
<tfm_net>net8.0</tfm_net>
27+
<tfm_framework>net471</tfm_framework>
28+
<tfm_windows>net8.0-windows</tfm_windows>
29+
<tfm_ios>net8.0-ios18.0</tfm_ios>
30+
<tfm_tvos>net8.0-tvos18.0</tfm_tvos>
31+
<tfm_maccatalyst>net8.0-maccatalyst18.0</tfm_maccatalyst>
3132
<!--The NoNFloatUsing below is a workaround for xamarin/xamarin-macios/#14434-->
3233
<NoNFloatUsing>true</NoNFloatUsing>
3334
</PropertyGroup>
34-
</Project>
35+
</Project>

0 commit comments

Comments
 (0)