Merge pull request #167 from WalletConnect/chore/ci-updates

chore: ci updates
WalletConnect · Dec 13, 2023 · d94b275 · d94b275
2 parents 841d977 + 5a0f8a9
commit d94b275
Show file tree

Hide file tree

Showing 15 changed files with 289 additions and 254 deletions.
diff --git a/.github/actions/ci/action.yml b/.github/actions/ci/action.yml
@@ -15,17 +15,15 @@ inputs:
 runs:
   using: "composite"
   steps:
-  # Package buildss
   - name: Run tests
     if: inputs.type == 'unit-tests'
     shell: bash
-    run: dotnet test --verbosity normal --filter Category=unit
+    run: dotnet test --verbosity minimal --filter Category=unit
 
-  # Integration tests
   - name: Run integration tests
     if: inputs.type == 'integration-tests'
     shell: bash
     env:
       RELAY_ENDPOINT: ${{ inputs.relay-endpoint }}
       PROJECT_ID: ${{ inputs.project-id }}
-    run: dotnet test --verbosity normal --filter Category=integration
+    run: dotnet test --verbosity minimal --filter Category=integration
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,58 @@
+name: .NET Build & Test
+
+on:
+  push:
+    branches: [ main, '2.0' ]
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: |
+          8.0.x
+
+    - name: Restore dependencies
+      run: dotnet restore
+      working-directory: ./
+
+    - name: Build
+      run: dotnet build --no-restore
+      working-directory: ./
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: build-artifacts
+        path: |
+          **/bin/**/*.dll
+          !**/Core Modules/**/bin/**/*.dll
+          !**/Tests/**/bin/**/*.dll
+
+  test:
+    needs: build
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        test-type: [unit-tests, integration-tests]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: |
+          8.0.x
+
+    - name: Run tests
+      uses: ./.github/actions/ci
+      with:
+        type: ${{ matrix.test-type }}
+        project-id: ${{ secrets.PROJECT_ID }}
diff --git a/.github/workflows/dotnet_build.yml b/.github/workflows/dotnet_build.yml
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,29 +1,68 @@
-name: Release to NuGet
+name: Release
 
 on:
+  workflow_dispatch:
   release:
     types: [published]
-    
+
 jobs:
   build:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: |
-          3.1.x
-          6.0.x
-    - name: Build
-      run: dotnet build -c Release
-    - uses: ./.github/actions/ci
-      with:
-        type: 'unit-tests'
-        project-id: ${{ secrets.PROJECT_ID }}
-    - name: Pack nugets
-      run: dotnet pack -c Release --no-build --output .
-    - name: Push to NuGet
-      run: dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://api.nuget.org/v3/index.json
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            8.0.x
+      
+      - name: Run tests
+        uses: ./.github/actions/ci
+        with:
+          type: 'unit-tests'
+          project-id: ${{ secrets.PROJECT_ID }}
+
+      - name: Build Release
+        run: dotnet build -c Release
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-artifacts
+          path: |
+            **/bin/**/*.dll
+            !**/Tests/**/bin/**/*.dll
+
+  pack:
+    needs: build
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+#      - name: Setup .NET
+#        uses: actions/setup-dotnet@v3
+#        with:
+#          dotnet-version: |
+#            8.0.x
+#
+#      - name: Pack nugets
+#        run: dotnet pack -c Release --no-build --output .
+#
+#      - name: Push to NuGet
+#        run: dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://api.nuget.org/v3/index.json
+
+  dispatch:
+    needs: pack
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger workflow in WalletConnectUnity
+        uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ secrets.REPOSITORY_DISPATCH_PAT }}
+          repository: walletconnect/walletconnectunity
+          event-type: new-release
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <DefaultVersion>2.1.6</DefaultVersion>
-    <DefaultTargetFrameworks>net6.0;netcoreapp3.1;netstandard2.1;</DefaultTargetFrameworks>
+      <DefaultTargetFrameworks>net6.0;net7.0;net8.0;netstandard2.1;</DefaultTargetFrameworks>
+      <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
   <PropertyGroup Label="C#">
     <LangVersion>latest</LangVersion>

diff --git a/Tests/WalletConnectSharp.Auth.Tests/WalletConnectSharp.Auth.Tests.csproj b/Tests/WalletConnectSharp.Auth.Tests/WalletConnectSharp.Auth.Tests.csproj
@@ -1,28 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
-        <PackageVersion>2.0.0</PackageVersion>
-        <AssemblyVersion>2.0.0</AssemblyVersion>
-        <FileVersion>2.0.0</FileVersion>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <PackageVersion>2.0.0</PackageVersion>
+    <AssemblyVersion>2.0.0</AssemblyVersion>
+    <FileVersion>2.0.0</FileVersion>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="xunit" />
-        <PackageReference Include="xunit.runner.visualstudio">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-        <PackageReference Include="coverlet.collector">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+    <PackageReference Include="xunit"/>
+    <PackageReference Include="xunit.runner.visualstudio">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\..\WalletConnectSharp.Auth\WalletConnectSharp.Auth.csproj" />
-      <ProjectReference Include="..\WalletConnectSharp.Tests.Common\WalletConnectSharp.Tests.Common.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\WalletConnectSharp.Auth\WalletConnectSharp.Auth.csproj"/>
+    <ProjectReference Include="..\WalletConnectSharp.Tests.Common\WalletConnectSharp.Tests.Common.csproj"/>
+  </ItemGroup>
 
 </Project>
diff --git a/Tests/WalletConnectSharp.Crypto.Tests/WalletConnectSharp.Crypto.Tests.csproj b/Tests/WalletConnectSharp.Crypto.Tests/WalletConnectSharp.Crypto.Tests.csproj
@@ -1,28 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
-        <PackageVersion>2.0.0</PackageVersion>
-        <AssemblyVersion>2.0.0</AssemblyVersion>
-        <FileVersion>2.0.0</FileVersion>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <PackageVersion>2.0.0</PackageVersion>
+    <AssemblyVersion>2.0.0</AssemblyVersion>
+    <FileVersion>2.0.0</FileVersion>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="xunit" />
-        <PackageReference Include="xunit.runner.visualstudio">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-        <PackageReference Include="coverlet.collector">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+    <PackageReference Include="xunit"/>
+    <PackageReference Include="xunit.runner.visualstudio">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\..\Core Modules\WalletConnectSharp.Crypto\WalletConnectSharp.Crypto.csproj" />
-      <ProjectReference Include="..\..\Core Modules\WalletConnectSharp.Network\WalletConnectSharp.Network.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core Modules\WalletConnectSharp.Crypto\WalletConnectSharp.Crypto.csproj"/>
+    <ProjectReference Include="..\..\Core Modules\WalletConnectSharp.Network\WalletConnectSharp.Network.csproj"/>
+  </ItemGroup>
 
 </Project>
diff --git a/Tests/WalletConnectSharp.Examples/WalletConnectSharp.Examples.csproj b/Tests/WalletConnectSharp.Examples/WalletConnectSharp.Examples.csproj
@@ -1,25 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFrameworks>net6.0;netcoreapp3.1;netcoreapp3.1</TargetFrameworks>
-        <PackageVersion>2.0.0</PackageVersion>
-        <AssemblyVersion>2.0.0</AssemblyVersion>
-        <FileVersion>2.0.0</FileVersion>
-        <OutputType>Exe</OutputType>
-        <IsPackable>false</IsPackable>
-        <PackageId>WalletConnect.Examples</PackageId>
-        <Title>WalletConnectSharp.Examples</Title>
-        <Authors>pedrouid, gigajuwels, edkek</Authors>
-        <Description>A port of the TypeScript SDK to C#. A complete implementation of the WalletConnect v2 protocol that can be used to connect to external wallets or connect a wallet to an external Dapp</Description>
-        <Copyright>Copyright (c) WalletConnect 2023</Copyright>
-        <PackageProjectUrl>https://walletconnect.org/</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/WalletConnect/WalletConnectSharp</RepositoryUrl>
-        <RepositoryType>git </RepositoryType>
-        <PackageTags>walletconnect wallet web3 ether ethereum blockchain evm</PackageTags>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <PackageVersion>2.0.0</PackageVersion>
+    <AssemblyVersion>2.0.0</AssemblyVersion>
+    <FileVersion>2.0.0</FileVersion>
+    <OutputType>Exe</OutputType>
+    <IsPackable>false</IsPackable>
+    <PackageId>WalletConnect.Examples</PackageId>
+    <Title>WalletConnectSharp.Examples</Title>
+    <Authors>pedrouid, gigajuwels, edkek</Authors>
+    <Description>A port of the TypeScript SDK to C#. A complete implementation of the WalletConnect v2 protocol that can be used to connect to external wallets or connect a wallet to an external Dapp</Description>
+    <Copyright>Copyright (c) WalletConnect 2023</Copyright>
+    <PackageProjectUrl>https://walletconnect.org/</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/WalletConnect/WalletConnectSharp</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageTags>walletconnect wallet web3 ether ethereum blockchain evm</PackageTags>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\..\WalletConnectSharp.Sign\WalletConnectSharp.Sign.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\WalletConnectSharp.Sign\WalletConnectSharp.Sign.csproj"/>
+  </ItemGroup>
 
 </Project>