2
0
mirror of https://github.com/9ParsonsB/Pulsar.git synced 2025-04-05 17:39:39 -04:00

Migrate to .NET 6

This commit is contained in:
Xjph 2022-12-04 15:01:56 -03:30
parent 388b7110cf
commit eeae99dc2a
8 changed files with 18 additions and 13 deletions

View File

@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<SignAssembly>false</SignAssembly> <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>ObservatoryKey.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>ObservatoryKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
@ -16,7 +17,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="ObservatoryFramework"> <Reference Include="ObservatoryFramework">
<HintPath>..\ObservatoryFramework\bin\Release\net5.0\ObservatoryFramework.dll</HintPath> <HintPath>..\ObservatoryFramework\bin\Release\net6.0\ObservatoryFramework.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

View File

@ -2,7 +2,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>Observatory</RootNamespace> <RootNamespace>Observatory</RootNamespace>
<SignAssembly>false</SignAssembly> <SignAssembly>false</SignAssembly>
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
@ -39,7 +40,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="ObservatoryFramework"> <Reference Include="ObservatoryFramework">
<HintPath>..\ObservatoryFramework\bin\Release\net5.0\ObservatoryFramework.dll</HintPath> <HintPath>..\ObservatoryFramework\bin\Release\net6.0\ObservatoryFramework.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

View File

@ -14,7 +14,7 @@ namespace Observatory.PluginManagement
private IEnumerable<IObservatoryWorker> observatoryWorkers; private IEnumerable<IObservatoryWorker> observatoryWorkers;
private IEnumerable<IObservatoryNotifier> observatoryNotifiers; private IEnumerable<IObservatoryNotifier> observatoryNotifiers;
private List<(string error, string detail)> errorList; private List<(string error, string detail)> errorList;
private Timer timer; private System.Timers.Timer timer;
public PluginEventHandler(IEnumerable<IObservatoryWorker> observatoryWorkers, IEnumerable<IObservatoryNotifier> observatoryNotifiers) public PluginEventHandler(IEnumerable<IObservatoryWorker> observatoryWorkers, IEnumerable<IObservatoryNotifier> observatoryNotifiers)
{ {

View File

@ -12,7 +12,7 @@ namespace Observatory.UI.Views
public partial class NotificationView : Window public partial class NotificationView : Window
{ {
private readonly double scale; private readonly double scale;
private readonly Timer timer; private readonly System.Timers.Timer timer;
private readonly Guid guid; private readonly Guid guid;
private bool defaultPosition = true; private bool defaultPosition = true;
private PixelPoint originalPosition; private PixelPoint originalPosition;

View File

@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<SignAssembly>false</SignAssembly> <SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>ObservatoryKey.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>ObservatoryKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
@ -36,7 +37,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="ObservatoryFramework"> <Reference Include="ObservatoryFramework">
<HintPath>..\ObservatoryFramework\bin\Release\net5.0\ObservatoryFramework.dll</HintPath> <HintPath>..\ObservatoryFramework\bin\Release\net6.0\ObservatoryFramework.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>

View File

@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>Observatory.Framework</RootNamespace> <RootNamespace>Observatory.Framework</RootNamespace>
</PropertyGroup> </PropertyGroup>

View File

@ -19,7 +19,7 @@ namespace NetCoreAudio.Players
[DllImport("winmm.dll")] [DllImport("winmm.dll")]
public static extern int waveOutSetVolume(IntPtr hwo, uint dwVolume); public static extern int waveOutSetVolume(IntPtr hwo, uint dwVolume);
private Timer _playbackTimer; private System.Timers.Timer _playbackTimer;
private Stopwatch _playStopwatch; private Stopwatch _playStopwatch;
private string _fileName; private string _fileName;
@ -32,7 +32,7 @@ namespace NetCoreAudio.Players
public Task Play(string fileName) public Task Play(string fileName)
{ {
_fileName = $"\"{fileName}\""; _fileName = $"\"{fileName}\"";
_playbackTimer = new Timer _playbackTimer = new System.Timers.Timer
{ {
AutoReset = false AutoReset = false
}; };

View File

@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup> </PropertyGroup>
@ -16,7 +17,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="ObservatoryFramework"> <Reference Include="ObservatoryFramework">
<HintPath>..\ObservatoryFramework\bin\Release\net5.0\ObservatoryFramework.dll</HintPath> <HintPath>..\ObservatoryFramework\bin\Release\net6.0\ObservatoryFramework.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>