From d349041cbe33e8eda2fc2c321cea3f8cc823cb55 Mon Sep 17 00:00:00 2001 From: Macocian Alexandru Victor Date: Wed, 3 Aug 2022 22:42:19 +0200 Subject: [PATCH] Update dependencies (#11) * Update dependencies * Fix pipelines --- .github/workflows/cd.yaml | 19 +++++++---------- .github/workflows/ci.yaml | 2 +- WpfExtended.Test/TestApplication/Launcher.cs | 6 ++++++ .../TestApplication/MainWindow.xaml.cs | 2 +- WpfExtended.Test/WpfExtended.Tests.csproj | 21 ++++++++++--------- WpfExtended/WpfExtended.csproj | 14 ++++++------- 6 files changed, 34 insertions(+), 30 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 3f43834..f982f87 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -31,7 +31,7 @@ jobs: - name: Install .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: '5.0.202' + dotnet-version: '6.x' - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v1.0.1 @@ -44,17 +44,14 @@ jobs: - name: Build WpfExtended project run: dotnet build WpfExtended -c $env:Configuration -p:SolutionDir=$env:GITHUB_WORKSPACE - - name: Push WpfExtended Nuget package - uses: brandedoutcast/publish-nuget@v2.5.5 - with: - PROJECT_FILE_PATH: WpfExtended\WpfExtended.csproj - NUGET_KEY: ${{secrets.NUGET_API_KEY}} + - name: Package WpfExtended + run: dotnet pack -c Release -o . WpfExtended\WpfExtended.csproj - name: Build WpfExtended.SourceGeneration project run: dotnet build WpfExtended.SourceGeneration -c $env:Configuration - - name: Push WpfExtended.SourceGeneration Nuget package - uses: brandedoutcast/publish-nuget@v2.5.5 - with: - PROJECT_FILE_PATH: WpfExtended.SourceGeneration\WpfExtended.SourceGeneration.csproj - NUGET_KEY: ${{secrets.NUGET_API_KEY}} + - name: Package WpfExtended.SourceGeneration + run: dotnet pack -c Release -o . WpfExtended.SourceGeneration\WpfExtended.SourceGeneration.csproj + + - name: Publish + run: dotnet nuget push *.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 34b8852..8ac11b4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -32,7 +32,7 @@ jobs: - name: Install .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: '5.0.202' + dotnet-version: '6.x' - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v1.0.1 diff --git a/WpfExtended.Test/TestApplication/Launcher.cs b/WpfExtended.Test/TestApplication/Launcher.cs index 55c3c83..170ce05 100644 --- a/WpfExtended.Test/TestApplication/Launcher.cs +++ b/WpfExtended.Test/TestApplication/Launcher.cs @@ -15,6 +15,12 @@ namespace WpfExtended.Tests { private static Launcher Instance { get; } = new Launcher(); + [STAThread] + public static void Main() + { + Instance.Run(); + } + protected override void SetupServiceManager(IServiceManager serviceManager) { serviceManager.RegisterDebugLoggerFactory(); diff --git a/WpfExtended.Test/TestApplication/MainWindow.xaml.cs b/WpfExtended.Test/TestApplication/MainWindow.xaml.cs index 5d363b7..82fb1c4 100644 --- a/WpfExtended.Test/TestApplication/MainWindow.xaml.cs +++ b/WpfExtended.Test/TestApplication/MainWindow.xaml.cs @@ -1,8 +1,8 @@ using Microsoft.Extensions.Logging; using System; using System.Extensions; -using System.Http; using System.IO; +using System.Net.Http; using System.Windows; using System.Windows.Extensions; using System.Windows.Media; diff --git a/WpfExtended.Test/WpfExtended.Tests.csproj b/WpfExtended.Test/WpfExtended.Tests.csproj index d11f0b0..fb9cedb 100644 --- a/WpfExtended.Test/WpfExtended.Tests.csproj +++ b/WpfExtended.Test/WpfExtended.Tests.csproj @@ -2,21 +2,22 @@ Library - net5.0-windows + net6.0-windows true + WpfExtended.Tests.Launcher - - - - - - - - - + + + + + + + + + diff --git a/WpfExtended/WpfExtended.csproj b/WpfExtended/WpfExtended.csproj index 2409514..c5dccb2 100644 --- a/WpfExtended/WpfExtended.csproj +++ b/WpfExtended/WpfExtended.csproj @@ -1,12 +1,12 @@  - net5.0-windows;netcoreapp3.1 + net6.0-windows;netcoreapp3.1 true true true License.txt - 0.6.1 + 0.6.2 latest Extension library for Windows Presentation Platform. @@ -84,11 +84,11 @@ http://www.java2s.com/Open-Source/CSharp_Free_Code/Windows_Presentation_Foundati - - - - - + + + + +