Skip to content

Update to .NET 10 SDK and .slnx solution file format #707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KrisVandermotten wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to .NET 10 SDK and .slnx solution file format #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/wf-build-release-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Install .NET SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 10.0.x

- name: Run trim analysis
working-directory: QRCoderTrimAnalysis
Expand All @@ -78,7 +78,7 @@ jobs:
- name: Install .NET SDK
uses: actions/setup-dotnet@v5
with:
dotnet-version: 8.0.x
dotnet-version: 10.0.x
source-url: https://nuget.pkg.github.com/Shane32/index.json
env:
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wf-build-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Install .NET SDK
uses: actions/setup-dotnet@v5
with:
dotnet-version: 8.0.x
dotnet-version: 10.0.x
source-url: https://api.nuget.org/v3/index.json
env:
NUGET_AUTH_TOKEN: ${{secrets.NUGET_AUTH_TOKEN}}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wf-build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
with:
dotnet-version: |
${{ matrix.dotnet-framework.sdk }}
8.0.x
10.0.x

- name: Run tests for ${{ matrix.dotnet-framework.name }}
working-directory: QRCoderTests
Expand All @@ -47,7 +47,7 @@ jobs:
- name: Install .NET SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 10.0.x

- name: Run trim analysis
working-directory: QRCoderTrimAnalysis
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wf-verify-formatting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install additional .NET SDKs
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 10.0.x

- name: Restore NuGet Packages
run: dotnet restore
Expand Down
211 changes: 0 additions & 211 deletions QRCoder.sln
View file
Open in desktop

This file was deleted.

42 changes: 42 additions & 0 deletions QRCoder.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<Solution>
<Configurations>
<Platform Name="Any CPU" />
<Platform Name="ARM" />
<Platform Name="x64" />
<Platform Name="x86" />
</Configurations>
<Folder Name="/Solution Items/">
<File Path=".editorconfig" />
<File Path="Directory.Build.props" />
<File Path="Directory.Build.targets" />
<File Path="global.json" />
</Folder>
<Project Path="QRCoder.Xaml/QRCoder.Xaml.csproj" />
<Project Path="QRCoder/QRCoder.csproj" />
<Project Path="QRCoderApiTests/QRCoderApiTests.csproj" />
<Project Path="QRCoderBenchmarks/QRCoderBenchmarks.csproj" />
<Project Path="QRCoderConsole/QRCoderConsole.csproj">
<Build Solution="Release|Any CPU" Project="false" />
</Project>
<Project Path="QRCoderDemo/QRCoderDemo.csproj">
<Platform Solution="*|ARM" Project="x86" />
<Platform Solution="*|x64" Project="x86" />
<Platform Solution="Release|x86" Project="x86" />
<Build Solution="*|ARM" Project="false" />
<Build Solution="*|x64" Project="false" />
<Build Solution="Release|Any CPU" Project="false" />
</Project>
<Project Path="QRCoderDemoUWP/QRCoderDemoUWP.csproj" Id="61933d20-db1f-4ee8-ac8e-3a2316cdd20c">
<Platform Solution="*|Any CPU" Project="x86" />
<Platform Solution="*|ARM" Project="ARM" />
<Platform Solution="*|x64" Project="x64" />
<Platform Solution="*|x86" Project="x86" />
<Build Solution="*|Any CPU" Project="false" />
<Deploy Solution="*|ARM" />
<Deploy Solution="*|x64" />
<Deploy Solution="*|x86" />
</Project>
<Project Path="QRCoderSamples/QRCoderSamples.csproj" />
<Project Path="QRCoderTests/QRCoderTests.csproj" />
<Project Path="QRCoderTrimAnalysis/QRCoderTrimAnalysis.csproj" />
</Solution>
4 changes: 2 additions & 2 deletions QRCoderTests/Helpers/HelperFunctions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.IO;
using System.Security.Cryptography;
using System.Reflection;
#if TEST_XAML
using SW = System.Windows;
Expand All @@ -8,6 +7,7 @@
#endif

namespace QRCoderTests.Helpers;

public static class HelperFunctions
{

Expand Down Expand Up @@ -40,7 +40,7 @@ public static string GetAssemblyPath()
#if NET5_0_OR_GREATER
=> AppDomain.CurrentDomain.BaseDirectory;
#else
=> Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location)?.Replace("file:\\", "") ?? "";
=> Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)?.Replace("file:\\", "") ?? "";
#endif

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"version": "10.0.100",
"allowPrerelease": false,
"rollForward": "latestFeature"
}
Expand Down
Loading