Merge pull request #24 from newky2k/development

Updates to .NET 8.0
newky2k · Jun 8, 2024 · c25b9bc · c25b9bc
2 parents 209a741 + 52b3a8c
commit c25b9bc
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 105 deletions.
diff --git a/DSoft.Messaging/DSoft.MessageBus.csproj b/DSoft.Messaging/DSoft.MessageBus.csproj
@@ -1,37 +1,48 @@
-<Project  Sdk="MSBuild.Sdk.Extras/3.0.44">
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net6.0-ios;net6.0-macos;net6.0-maccatalyst;net6.0-tvos;net6.0-android;;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid90;MonoAndroid10.0;MonoAndroid11.0;MonoAndroid12.0;tizen40;</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net6.0-windows7.0;net6.0-windows10.0.19041;</TargetFrameworks>
-    <PackageId>DSoft.MessageBus</PackageId>
-    <ReleaseVersion>1.3.4</ReleaseVersion>
-    <AssemblyName>DSoft.MessageBus</AssemblyName>
-    <Company>DSoft Developments</Company>
-    <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Title>DSoft.MessageBus</Title>
-    <Description>Cross-platform MessageBus system</Description>
-    <Copyright>© DSoft Developments. All rights reserved.</Copyright>
-    <AssemblyVersion>1.3.5.0</AssemblyVersion>
-    <FileVersion>1.3.5.0</FileVersion>
-    <ConsolePause>false</ConsolePause>
-    <Version>1.3.4.0</Version>
-    <PackageProjectUrl>https://github.com/newky2k/MessageBus</PackageProjectUrl>
-    <PackageReleaseNotes>Added optional MessageBus.RunPostOnSeperateTask option to improve Post performance.</PackageReleaseNotes>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>DSoft.snk</AssemblyOriginatorKeyFile>
-    <PackageLicenseUrl></PackageLicenseUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryUrl>https://github.com/newky2k/MessageBus</RepositoryUrl>
-    <RepositoryType>GIT</RepositoryType>
-    <PackageTags>MessageBus</PackageTags>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <DefineConstants>$(DefineConstants);</DefineConstants>
-    <Configurations>Debug;Release;</Configurations>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-	<GenerateDocumentationFile>true</GenerateDocumentationFile>
-	<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-	<GenerateLibraryLayout>true</GenerateLibraryLayout>
-  </PropertyGroup>
+<Project  Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFrameworks>netstandard2.1;net8.0;net8.0-ios;net8.0-macos;net8.0-maccatalyst;net8.0-tvos;net8.0-android;</TargetFrameworks>
+		<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net8.0-windows7.0;net8.0-windows10.0.19041;</TargetFrameworks>
+		<PackageId>DSoft.MessageBus</PackageId>
+		<ReleaseVersion>1.3.4</ReleaseVersion>
+		<AssemblyName>DSoft.MessageBus</AssemblyName>
+		<Company>DSoft Developments</Company>
+		<Product>$(AssemblyName) ($(TargetFramework))</Product>
+		<Title>DSoft.MessageBus</Title>
+		<Description>Cross-platform MessageBus system</Description>
+		<Copyright>© DSoft Developments. All rights reserved.</Copyright>
+		<AssemblyVersion>1.3.5.0</AssemblyVersion>
+		<FileVersion>1.3.5.0</FileVersion>
+		<ConsolePause>false</ConsolePause>
+		<Version>1.3.4.0</Version>
+		<PackageProjectUrl>https://github.com/newky2k/MessageBus</PackageProjectUrl>
+		<PackageReleaseNotes>Added optional MessageBus.RunPostOnSeperateTask option to improve Post performance.</PackageReleaseNotes>
+		<SignAssembly>true</SignAssembly>
+		<AssemblyOriginatorKeyFile>DSoft.snk</AssemblyOriginatorKeyFile>
+		<PackageLicenseUrl></PackageLicenseUrl>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<RepositoryUrl>https://github.com/newky2k/MessageBus</RepositoryUrl>
+		<RepositoryType>GIT</RepositoryType>
+		<PackageTags>MessageBus</PackageTags>
+		<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+		<DefineConstants>$(DefineConstants);</DefineConstants>
+		<Configurations>Debug;Release;</Configurations>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+		<GenerateLibraryLayout>true</GenerateLibraryLayout>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">11.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tvos'">11.0</SupportedOSPlatformVersion>
+		<NoWarn>$(NoWarn);NETSDK1206;CA1416;</NoWarn>
+	</PropertyGroup>
 
+	<ItemGroup>
+		<None Include="../readme.md" Pack="true" PackagePath="\" />
+	</ItemGroup>
+
 	<PropertyGroup Condition=" '$(Configuration)'=='Release' ">
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -55,73 +66,64 @@
 		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
 	</PropertyGroup>
 
-    <PropertyGroup Condition=" $(TargetFramework.StartsWith('net6.0-windows10')) ">
-	    <UseWinUI>true</UseWinUI>
-	    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-	    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64;win10-arm</RuntimeIdentifiers>
-	    <DefineConstants>$(DefineConstants);WINUI</DefineConstants>
-    </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
+	<PropertyGroup Condition=" $(TargetFramework.StartsWith('net8.0-windows10')) ">
+		<SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
+		<UseWinUI>true</UseWinUI>
+		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+		<RuntimeIdentifiers>win-x86;win-x64;win-arm64;</RuntimeIdentifiers>
+		<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
+	</PropertyGroup>
+
+	<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
+		<DebugSymbols>true</DebugSymbols>
+	</PropertyGroup>
 
-	<PropertyGroup Condition=" $(TargetFramework.StartsWith('net6.0-windows7.0')) ">
+	<PropertyGroup Condition=" $(TargetFramework.StartsWith('net8.0-windows7.0')) ">
 		<UseWPF>true</UseWPF>
 	</PropertyGroup>
-	
-  <ItemGroup>
-    <Compile Include="**\*.shared.cs" />
-    <Compile Include="**\*.shared.*.cs" />
-  </ItemGroup>
-  
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework) == 'net6.0' ">
-    <Compile Include="**\*.netstandard.cs" />
-    <Compile Include="**\*.netstandard.*.cs" />
-  </ItemGroup>
-
-	<ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0-windows7.0')) ">
+
+	<ItemGroup>
+		<Compile Include="**\*.shared.cs" />
+		<Compile Include="**\*.shared.*.cs" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework) == 'net8.0' ">
+		<Compile Include="**\*.netstandard.cs" />
+		<Compile Include="**\*.netstandard.*.cs" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" $(TargetFramework.StartsWith('net8.0-windows7.0')) ">
 		<Compile Include="**\*.wpf.cs" />
 		<Compile Include="**\*.wpf.*.cs" />
 	</ItemGroup>
-	
-	<ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0-windows10')) ">
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
+
+	<ItemGroup Condition=" $(TargetFramework.StartsWith('net8.0-windows10')) ">
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
 
 		<Compile Include="**\*.winui.cs" />
 		<Compile Include="**\*.winui.*.cs" />
 
 	</ItemGroup>
-
-  <ItemGroup Condition=" $(TargetFramework) == 'net6.0-android' Or $(TargetFramework.StartsWith('MonoAndroid'))">
-    <Compile Include="**\*.android.cs" />
-    <Compile Include="**\*.android.*.cs" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" $(TargetFramework) == 'net6.0-ios' Or $(TargetFramework) == 'net6.0-maccatalyst' or $(TargetFramework.StartsWith('Xamarin.iOS'))">
-    <Compile Include="**\*.ios.cs" />
-    <Compile Include="**\*.ios.*.cs" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" $(TargetFramework) == 'net6.0-macos' Or $(TargetFramework.StartsWith('Xamarin.Mac'))">
-    <Compile Include="**\*.mac.cs" />
-    <Compile Include="**\*.mac.*.cs" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" $(TargetFramework) == 'net6.0-tvos' Or $(TargetFramework.StartsWith('Xamarin.TVOS'))">
-    <Compile Include="**\*.tvos.cs" />
-    <Compile Include="**\*.tvos.*.cs" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" $(TargetFramework) == 'tizen40'">
-    <Compile Include="**\*.tizen.cs" />
-    <Compile Include="**\*.tizen.*.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\README.md">
-      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
-    </None>
-  </ItemGroup>
+
+	<ItemGroup Condition=" $(TargetFramework) == 'net8.0-android' ">
+		<Compile Include="**\*.android.cs" />
+		<Compile Include="**\*.android.*.cs" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" $(TargetFramework) == 'net8.0-ios' Or $(TargetFramework) == 'net8.0-maccatalyst' ">
+		<Compile Include="**\*.ios.cs" />
+		<Compile Include="**\*.ios.*.cs" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" $(TargetFramework) == 'net8.0-macos'">
+		<Compile Include="**\*.mac.cs" />
+		<Compile Include="**\*.mac.*.cs" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" $(TargetFramework) == 'net8.0-tvos'">
+		<Compile Include="**\*.tvos.cs" />
+		<Compile Include="**\*.tvos.*.cs" />
+	</ItemGroup>
+
 </Project>
diff --git a/DSoft.Messaging/MessageBus.shared.cs b/DSoft.Messaging/MessageBus.shared.cs
@@ -96,6 +96,7 @@ private static void PostInternal(MessageBusEvent busEvent)
 				}
 			}
 		}
+
 		/// <summary>
 		/// Post the specified Event to the Default MessageBus
 		/// </summary>

diff --git a/WPFSample/WPFSample.csproj b/WPFSample/WPFSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 

diff --git a/azure-pipelines-mergetest.yml b/azure-pipelines-mergetest.yml
@@ -29,9 +29,8 @@ steps:
   inputs:
     restoreSolution: '$(solution)'
 
-- task: VSBuild@1
-  displayName: Build Solution
+- task: DotNetCoreCLI@2
+  displayName: dotnet build
   inputs:
-    solution: '$(solution)'
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
+    projects: '$(solution)'
+    arguments: '--configuration=$(buildConfiguration) /p:Platform="$(buildPlatform)"'
diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
@@ -22,14 +22,13 @@ variables:
   netVersion: '6.0.x'
   releaseSuffix: ''
 
-name: 3.0.$(date:yyMM).$(date:dd)$(rev:r)
+name: 4.0.$(date:yyMM).$(date:dd)$(rev:r)
 steps:
 - task: NuGetToolInstaller@1
   displayName: Install Latest Nuget
 
 - task: Bash@3
   displayName: Install MAUI
-
   inputs:
     targetType: 'inline'
     script: 
@@ -40,13 +39,11 @@ steps:
   inputs:
     restoreSolution: '$(solution)'
 
-- task: VSBuild@1
-  displayName: Build Solution
+- task: DotNetCoreCLI@2
+  displayName: dotnet build
   inputs:
-    solution: '$(solution)'
-    msbuildArgs: '/p:Version=$(Build.BuildNumber)$(releaseSuffix) /p:AssemblyVersion=$(Build.BuildNumber) /p:FileVersion=$(Build.BuildNumber)'
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
+    projects: '$(solution)'
+    arguments: '--configuration=$(buildConfiguration) /p:Platform="$(buildPlatform)" /p:Version=$(Build.BuildNumber)$(releaseSuffix) /p:AssemblyVersion=$(Build.BuildNumber) /p:FileVersion=$(Build.BuildNumber) '
 
 - task: CopyFiles@2
   displayName: Copy Files to $(build.artifactstagingdirectory)
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,6 +96,7 @@ private static void PostInternal(MessageBusEvent busEvent) @@
     				}
     			}
     		}
     		/// <summary>
     		/// Post the specified Event to the Default MessageBus
     		/// </summary>
@@ Expand Down @@