Skip to content

Commit 875e7a8

Browse files
snakefootsnakefoot
authored
NET10 (#40)
1 parent ff77edb commit 875e7a8

File tree

8 files changed

+137
-15
lines changed

8 files changed

+137
-15
lines changed

‎NLog.Targets.MauiLog.sln‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.3.32804.467
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.0.11217.181 d18.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EA9503EA-0938-497B-ACBF-5907B66D56A1}"
77
ProjectSection(SolutionItems) = preProject
88
.gitignore = .gitignore
99
appveyor.yml = appveyor.yml
1010
global.json = global.json
11+
maui.check.manifest.json = maui.check.manifest.json
1112
README.md = README.md
1213
update-global-json.ps1 = update-global-json.ps1
1314
EndProjectSection

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ NLog Target for debugging on MAUI / Xamarin Mobile Platforms:
1515
- `Install-Package NLog.Targets.MauiLog`
1616
- `Install-Package NLog.Extensions.Logging`
1717

18-
or in your csproj (Use ver. 8 for NET8, and ver. 7 for NET7 etc.):
18+
or in your csproj (Use ver. 8 for NET8, and ver. 9 for NET9 etc.):
1919

2020
```xml
21-
<PackageReference Include="NLog.Targets.MauiLog" Version="9.*" />
21+
<PackageReference Include="NLog.Targets.MauiLog" Version="10.*" />
2222
<PackageReference Include="NLog.Extensions.Logging" Version="6.*" />
2323
```
2424

‎appveyor.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@ skip_tags: true
66
skip_branch_with_pr: true
77
nuget:
88
disable_publish_on_pr: true
9+
install:
10+
- ps: |
11+
Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile "$env:temp\dotnet-install.ps1"
12+
& $env:temp\dotnet-install.ps1 -Architecture x64 -Version '10.0.100' -InstallDir "$env:ProgramFiles\dotnet"
913
build_script:
1014
- ps: dotnet --version
1115
- ps: dotnet tool install -g Redth.Net.Maui.Check
12-
- ps: ./update-global-json.ps1 9.0.300
13-
- ps: msbuild src/NLog.Targets.MauiLog/NLog.Targets.MauiLog.csproj /t:restore,pack /p:targetFrameworks='"net9.0;net9.0-ios;net9.0-macos;net9.0-android;net9.0-maccatalyst"' /p:VersionPrefix=9.0.3 /p:Configuration=Release /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg /p:EmbedUntrackedSources=true /p:PublishRepositoryUrl=true /verbosity:minimal
14-
- ps: dotnet build -c Release -p:VersionPrefix=9.0.3
16+
- ps: ./update-global-json.ps1 10.0.100
17+
- ps: dotnet build /p:VersionPrefix=10.0.3 /p:Configuration=Release
18+
- ps: dotnet pack /p:VersionPrefix=10.0.3 /p:Configuration=Release /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg /p:EmbedUntrackedSources=true /p:PublishRepositoryUrl=true /verbosity:minimal
1519
artifacts:
1620
- path: '**\NLog.*.nupkg'
1721
- path: '**\NLog.*.snupkg'
@@ -21,3 +25,7 @@ deploy:
2125
secure: f6oWebyOFLpuuo2PMd6xgoxwMq+JvXVUmPyBme89zS7UF0zcvLYPSKN/p6B/KaMs
2226
on:
2327
branch: master
28+
environment:
29+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
30+
DOTNET_CLI_TELEMETRY_OPTOUT: true
31+
DOTNET_NOLOGO: true

‎examples/MauiApp2/MauiApp2.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0-android;net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
66

77
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
8-
<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
8+
<!-- <TargetFrameworks>$(TargetFrameworks);net10.0-tizen</TargetFrameworks> -->
99

1010
<!-- Note for MacCatalyst:
1111
The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.300",
3+
"version": "10.0.100",
44
"rollForward": "latestMinor"
55
}
66
}

‎maui.check.manifest.json‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
{
2+
"check": {
3+
"toolVersion": "2.0.0",
4+
"variables": {
5+
"DOTNET_SDK_VERSION": "7.0.302",
6+
"OPENJDK_VERSION": "11.0.19",
7+
"WORKLOAD_ROLLBACK": "https://maui.blob.core.windows.net/metadata/rollbacks/7.0.86.json",
8+
"PACKAGE_SOURCE_NUGET_ORG": "https://api.nuget.org/v3/index.json"
9+
},
10+
"openjdk": {
11+
"version": "11.0",
12+
"urls": {
13+
"win": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-x64.msi",
14+
"winArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-windows-aarch6464.msi",
15+
"osx": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-x64.pkg",
16+
"osxArm64": "https://aka.ms/download-jdk/microsoft-jdk-$(OPENJDK_VERSION)-macos-aarch64.pkg"
17+
}
18+
},
19+
"vswin": {
20+
"minimumVersion": "17.6"
21+
},
22+
"xcode": {
23+
"exactVersion": "21812",
24+
"exactVersionName": "14.3"
25+
},
26+
"android": {
27+
"packages": [
28+
{
29+
"path": "emulator",
30+
"version": "31.3.12"
31+
},
32+
{
33+
"path": "build-tools;36.0.0",
34+
"version": "36.0.0"
35+
},
36+
{
37+
"path": "platforms;android-36",
38+
"version": "2"
39+
},
40+
{
41+
"path": "system-images;android-36;google_apis;x86_64",
42+
"version": "10",
43+
"alternatives": [
44+
{
45+
"path": "system-images;android-36;google_apis_playstore;x86_64",
46+
"version": "10"
47+
},
48+
{
49+
"path": "system-images;android-36;google_apis;arm64-v8a",
50+
"version": "10"
51+
},
52+
{
53+
"path": "system-images;android-36;google_apis;arm64-v8a",
54+
"version": "10"
55+
}
56+
]
57+
},
58+
{
59+
"path": "platform-tools",
60+
"version": "36.0.0"
61+
},
62+
{
63+
"path": "cmdline-tools;8.0",
64+
"version": "8.0"
65+
}
66+
],
67+
"emulators": [
68+
{
69+
"sdkId": "system-images;android-35;google_apis;x86_64",
70+
"alternateSdkIds": [
71+
"system-images;android-31;google_apis_playstore;x86_64",
72+
"system-images;android-33;google_apis_playstore;x86_64",
73+
"system-images;android-36;google_apis_playstore;x86_64",
74+
"system-images;android-31;google_apis;arm64-v8a",
75+
"system-images;android-33;google_apis;arm64-v8a",
76+
"system-images;android-36;google_apis;arm64-v8a"
77+
],
78+
"desc": "Android Emulator - x86_64 - API36 - Google API's",
79+
"apiLevel": 36,
80+
"tag": "google_apis",
81+
"device": "pixel"
82+
}
83+
]
84+
},
85+
"dotnet": {
86+
"sdks": [
87+
{
88+
"version": "$(DOTNET_SDK_VERSION)",
89+
"requireExact": false,
90+
"urls": {
91+
"win64": "https://dotnetcli.azureedge.net/dotnet/Sdk/$(DOTNET_SDK_VERSION)/dotnet-sdk-$(DOTNET_SDK_VERSION)-win-x64.exe",
92+
"winArm64": "https://dotnetcli.azureedge.net/dotnet/Sdk/$(DOTNET_SDK_VERSION)/dotnet-sdk-$(DOTNET_SDK_VERSION)-win-arm64.exe",
93+
"win": "https://dotnetcli.azureedge.net/dotnet/Sdk/$(DOTNET_SDK_VERSION)/dotnet-sdk-$(DOTNET_SDK_VERSION)-win-x86.exe",
94+
"osx": "https://dotnetcli.azureedge.net/dotnet/Sdk/$(DOTNET_SDK_VERSION)/dotnet-sdk-$(DOTNET_SDK_VERSION)-osx-x64.pkg",
95+
"osxArm64": "https://dotnetcli.azureedge.net/dotnet/Sdk/$(DOTNET_SDK_VERSION)/dotnet-sdk-$(DOTNET_SDK_VERSION)-osx-arm64.pkg"
96+
},
97+
"packageSources": [
98+
"$(PACKAGE_SOURCE_NUGET_ORG)"
99+
],
100+
"workloadRollback": "$(WORKLOAD_ROLLBACK)",
101+
"workloadIds": [
102+
"maui",
103+
"android",
104+
"maccatalyst",
105+
"ios",
106+
"tvos",
107+
"macos"
108+
]
109+
}
110+
]
111+
}
112+
}
113+
}

‎src/NLog.Targets.MauiLog/NLog.Targets.MauiLog.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<AppVeyorBuildNumber>$(APPVEYOR_BUILD_NUMBER)</AppVeyorBuildNumber>
5-
<TargetFrameworks Condition="'$(TargetFrameworks)' == '' And '$(AppVeyorBuildNumber)' == ''">net9.0</TargetFrameworks>
6-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net9.0;net9.0-ios;net9.0-macos;net9.0-android;net9.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(TargetFrameworks)' == '' And '$(AppVeyorBuildNumber)' == ''">net10.0</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net10.0;net10.0-ios;net10.0-macos;net10.0-android;net10.0-maccatalyst</TargetFrameworks>
77
<FileVersion Condition="'$(AppVeyorBuildNumber)' != ''">$(VersionPrefix).$(AppVeyorBuildNumber)</FileVersion>
88

99
<Title>NLog.Targets.MauiLog for $(TargetFramework)</Title>
@@ -18,7 +18,7 @@
1818
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
1919
<PackageReadmeFile>README.md</PackageReadmeFile>
2020
<PackageReleaseNotes>
21-
- MAUI ver. 9.0
21+
- MAUI ver. 10.0
2222
- Updated to NLog v6.0.3 with AOT-support
2323

2424
See https://github.com/NLog/NLog.Targets.MauiLog for documentation of NLog targets for MAUI

‎update-global-json.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
dotnet workload install maui macos android ios maccatalyst
44

5-
maui-check --fix --non-interactive
5+
maui-check --fix --non-interactive --manifest maui.check.manifest.json
66

77
exit 0

0 commit comments

Comments
 (0)