Skip to content

Commit 9b46e79

Browse files
kekyokekyo
committed
Merge branch 'develop'
2 parents 227cca1 + ffd6ba8 commit 9b46e79

File tree

88 files changed

+2172
-116
lines changed

Some content is hidden

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

88 files changed

+2172
-116
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ jobs:
3838
6.0.x
3939
7.0.x
4040
8.0.x
41+
9.0.x
4142
4243
- name: Setup NuGet package reference
4344
run: |
44-
dotnet nuget add source ${{secrets.GH_LOCAL_NUGET_URL}} -n ref1 -u ${{secrets.GH_LOCAL_NUGET_USER}} -p ${{secrets.GH_LOCAL_NUGET_PASSWORD}} --store-password-in-clear-text --configfile nuget.config
45+
# dotnet nuget add source ${{secrets.GH_LOCAL_NUGET_URL}} -n ref1 -u ${{secrets.GH_LOCAL_NUGET_USER}} -p ${{secrets.GH_LOCAL_NUGET_PASSWORD}} --store-password-in-clear-text --configfile nuget.config
4546
# dotnet nuget add source ${{secrets.GH_NUGET_URL}} -n ref2 -u ${{secrets.GH_NUGET_USER}} -p ${{secrets.GH_NUGET_PASSWORD}} --store-password-in-clear-text --configfile nuget.config
4647

4748
#-----------------------------------------------------------------------
@@ -63,11 +64,11 @@ jobs:
6364
#-----------------------------------------------------------------------
6465
# Deploy packages (develop)
6566

66-
- name: Deploy NuGet package (develop/ref1)
67-
if: startsWith( github.ref, 'refs/tags/' )
68-
run: |
69-
dotnet nuget push artifacts/FlashCap.*.nupkg --source ref1
70-
dotnet nuget push artifacts/FSharp.FlashCap.*.nupkg --source ref1
67+
#- name: Deploy NuGet package (develop/ref1)
68+
# if: startsWith( github.ref, 'refs/tags/' )
69+
# run: |
70+
# dotnet nuget push artifacts/FlashCap.*.nupkg --source ref1
71+
# dotnet nuget push artifacts/FSharp.FlashCap.*.nupkg --source ref1
7172

7273
#-----------------------------------------------------------------------
7374
# Deploy packages (main)

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,3 +242,5 @@ test-templates/
242242

243243
*.bak
244244
*.orig
245+
246+
**/.DS_Store

‎Directory.Build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
<RootNamespace>FlashCap</RootNamespace>
1919
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
2020
<GenerateDocumentationFile>true</GenerateDocumentationFile>
21-
<NoWarn>$(NoWarn);CS1570;CS1591;CA1416;CS8981</NoWarn>
21+
<NoWarn>$(NoWarn);CS1570;CS1591;CA1416;CS8981;NETSDK1215</NoWarn>
2222

2323
<Product>FlashCap</Product>
2424
<Trademark>FlashCap</Trademark>
2525
<Copyright>Copyright (c) Kouji Matsui</Copyright>
2626
<Description>Independent camera capture library on .NET/.NET Core and .NET Framework.</Description>
2727

28-
<Company>Kouji Matsui (@kozy_kekyo, @kekyo@mastodon.cloud)</Company>
29-
<Authors>Kouji Matsui (@kozy_kekyo, @kekyo@mastodon.cloud)</Authors>
28+
<Company>Kouji Matsui (@kekyo@mi.kekyo.net)</Company>
29+
<Authors>Kouji Matsui (@kekyo@mi.kekyo.net)</Authors>
3030
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
3131
<PackageProjectUrl>https://github.com/kekyo/FlashCap</PackageProjectUrl>
3232
<PackageIcon>FlashCap.100.png</PackageIcon>
@@ -50,7 +50,7 @@
5050
</PropertyGroup>
5151

5252
<ItemGroup>
53-
<PackageReference Include="RelaxVersioner" Version="3.3.0" PrivateAssets="All" />
53+
<PackageReference Include="RelaxVersioner" Version="3.13.0" PrivateAssets="All" />
5454
</ItemGroup>
5555

5656
<ItemGroup Condition="'$(Configuration)' == 'Release'">

‎FSharp.FlashCap/CaptureDeviceDescriptorExtension.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
////////////////////////////////////////////////////////////////////////////
22
//
33
// FlashCap - Independent camera capture library.
4-
// Copyright (c) Kouji Matsui (@kozy_kekyo, @kekyo@mastodon.cloud)
4+
// Copyright (c) Kouji Matsui (@kekyo@mi.kekyo.net)
55
//
66
// Licensed under Apache-v2: https://opensource.org/licenses/Apache-2.0
77
//

‎FSharp.FlashCap/CaptureDeviceExtension.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
////////////////////////////////////////////////////////////////////////////
22
//
33
// FlashCap - Independent camera capture library.
4-
// Copyright (c) Kouji Matsui (@kozy_kekyo, @kekyo@mastodon.cloud)
4+
// Copyright (c) Kouji Matsui (@kekyo@mi.kekyo.net)
55
//
66
// Licensed under Apache-v2: https://opensource.org/licenses/Apache-2.0
77
//

‎FSharp.FlashCap/CaptureDevicesExtension.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
////////////////////////////////////////////////////////////////////////////
22
//
33
// FlashCap - Independent camera capture library.
4-
// Copyright (c) Kouji Matsui (@kozy_kekyo, @kekyo@mastodon.cloud)
4+
// Copyright (c) Kouji Matsui (@kekyo@mi.kekyo.net)
55
//
66
// Licensed under Apache-v2: https://opensource.org/licenses/Apache-2.0
77
//

‎FSharp.FlashCap/FSharp.FlashCap.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net48;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net48;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
55
<IsPackable>true</IsPackable>
66
</PropertyGroup>
77

‎FSharp.FlashCap/Internal.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
////////////////////////////////////////////////////////////////////////////
22
//
33
// FlashCap - Independent camera capture library.
4-
// Copyright (c) Kouji Matsui (@kozy_kekyo, @kekyo@mastodon.cloud)
4+
// Copyright (c) Kouji Matsui (@kekyo@mi.kekyo.net)
55
//
66
// Licensed under Apache-v2: https://opensource.org/licenses/Apache-2.0
77
//

‎FSharp.FlashCap/ObservableCaptureDeviceExtension.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
////////////////////////////////////////////////////////////////////////////
22
//
33
// FlashCap - Independent camera capture library.
4-
// Copyright (c) Kouji Matsui (@kozy_kekyo, @kekyo@mastodon.cloud)
4+
// Copyright (c) Kouji Matsui (@kekyo@mi.kekyo.net)
55
//
66
// Licensed under Apache-v2: https://opensource.org/licenses/Apache-2.0
77
//

‎FSharp.FlashCap/PixelBufferExtension.fs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
////////////////////////////////////////////////////////////////////////////
22
//
33
// FlashCap - Independent camera capture library.
4-
// Copyright (c) Kouji Matsui (@kozy_kekyo, @kekyo@mastodon.cloud)
4+
// Copyright (c) Kouji Matsui (@kekyo@mi.kekyo.net)
55
//
66
// Licensed under Apache-v2: https://opensource.org/licenses/Apache-2.0
77
//
@@ -11,6 +11,8 @@ namespace FlashCap
1111

1212
open System.Diagnostics
1313

14+
#nowarn 3261
15+
1416
[<AutoOpen>]
1517
module public PixelBufferExtension =
1618

0 commit comments

Comments
 (0)