Merge branch 'dev'

jherby2k · Dec 7, 2021 · 5bd5b95 · 5bd5b95
2 parents 1558589 + 4c78a52
commit 5bd5b95
Show file tree

Hide file tree

Showing 179 changed files with 2,262 additions and 1,887 deletions.
diff --git a/AudioWorks/AudioWorks.sln.DotSettings b/AudioWorks/AudioWorks.sln.DotSettings
@@ -259,7 +259,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp90</s:String>
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp100</s:String>
 	<s:String x:Key="/Default/Environment/Hierarchy/Build/SolBuilderDuo/UseMsbuildSolutionBuilder/@EntryValue">No</s:String>
 	<s:String x:Key="/Default/Environment/Hierarchy/PsiConfigurationSettingsKey/CustomLocation/@EntryValue">C:\Users\jerem\AppData\Local\JetBrains\Transient\ReSharperPlatformVs15\v09_fd249c97\SolutionCaches</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>

diff --git a/AudioWorks/Directory.Build.props b/AudioWorks/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netstandard2.0</TargetFrameworks>
-    <LangVersion>9.0</LangVersion>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
     <Revision>$(BUILD_BUILDID)</Revision>
     <Revision Condition="'$(Revision)'==''">0</Revision>

diff --git a/AudioWorks/src/AudioWorks.Api/AudioFileAnalyzer.cs b/AudioWorks/src/AudioWorks.Api/AudioFileAnalyzer.cs
@@ -145,7 +145,7 @@ public async Task AnalyzeAsync(
             params ITaggedAudioFile[] audioFiles)
         {
             if (audioFiles == null) throw new ArgumentNullException(nameof(audioFiles));
-            // ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
             if (audioFiles.Any(audioFile => audioFile == null))
                 throw new ArgumentException("One or more audio files are null.", nameof(audioFiles));
 

diff --git a/AudioWorks/src/AudioWorks.Api/AudioFileEncoder.cs b/AudioWorks/src/AudioWorks.Api/AudioFileEncoder.cs
@@ -172,7 +172,7 @@ public async Task<IEnumerable<ITaggedAudioFile>> EncodeAsync(
             params ITaggedAudioFile[] audioFiles)
         {
             if (audioFiles == null) throw new ArgumentNullException(nameof(audioFiles));
-            // ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
             if (audioFiles.Any(audioFile => audioFile == null))
                 throw new ArgumentException("One or more audio files are null.", nameof(audioFiles));
 

diff --git a/AudioWorks/src/AudioWorks.Api/AudioWorks.Api.csproj b/AudioWorks/src/AudioWorks.Api/AudioWorks.Api.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <FileVersion>$(VersionPrefix).$(Revision)</FileVersion>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <Description>The primary AudioWorks API. AudioWorks is a cross-platform, multi-format audio conversion and tagging suite.</Description>
@@ -28,9 +28,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AudioWorks.Extensibility" Version="1.1.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
-    <PackageReference Include="NuGet.Resolver" Version="5.8.1" />
+    <PackageReference Include="AudioWorks.Extensibility" Version="1.2.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
+    <!-- Held back for PowerShell 5.1 compatibility -->
+    <PackageReference Include="NuGet.Resolver" Version="5.8.0" />
+    <!-- Held back for PowerShell 7.0 compatibility -->
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.8.0" />
   </ItemGroup>
 

diff --git a/AudioWorks/src/AudioWorks.Api/ExtensionInstaller.cs b/AudioWorks/src/AudioWorks.Api/ExtensionInstaller.cs
@@ -230,9 +230,7 @@ await ResolvePackagesAsync(packageMetadata.Identity, cacheContext, cancellationT
 
                         if (downloadResult.Status != DownloadResourceResultStatus.Available ||
                             downloadResult.PackageReader == null ||
-#pragma warning disable IDE0083 // Use pattern matching
-                            !(downloadResult.PackageStream is FileStream packageStream))
-#pragma warning restore IDE0083 // Use pattern matching
+                            downloadResult.PackageStream is not FileStream packageStream)
                             continue;
 
                         var libGroups = (await downloadResult.PackageReader.GetLibItemsAsync(cancellationToken)
@@ -269,7 +267,7 @@ await ResolvePackagesAsync(packageMetadata.Identity, cacheContext, cancellationT
 
                             CopyContentFiles(
                                 sourceFileName,
-                                Path.Combine(extensionDir.FullName, new DirectoryInfo(sourceFileName)!.Parent!.Name,
+                                Path.Combine(extensionDir.FullName, new DirectoryInfo(sourceFileName).Parent!.Name,
                                     Path.GetFileName(item)),
                                 logger);
                         }

diff --git a/AudioWorks/src/AudioWorks.Commands/AudioWorks.Commands.csproj b/AudioWorks/src/AudioWorks.Commands/AudioWorks.Commands.csproj
@@ -2,9 +2,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1;net462</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)'!='Windows_NT'">net5.0;netcoreapp3.1</TargetFrameworks>
-    <VersionPrefix>1.1.0</VersionPrefix>
+    <TargetFrameworks>net6.0;netcoreapp3.1;net462</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)'!='Windows_NT'">net6.0;netcoreapp3.1</TargetFrameworks>
+    <VersionPrefix>1.2.0</VersionPrefix>
     <FileVersion>$(VersionPrefix).$(Revision)</FileVersion>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
@@ -25,31 +25,31 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
     <PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" />
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.0" PrivateAssets="all" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="5.0.0" />
   </ItemGroup>
 
   <!-- ReSharper disable once UnknownProperty -->
-  <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Nuget.Resolver" Version="5.8.1" />
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Nuget.Resolver" Version="6.0.0" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
   </ItemGroup>
 
   <!-- ReSharper disable once UnknownProperty -->
   <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.9" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.9" />
-    <PackageReference Include="Nuget.Resolver" Version="5.8.1" />
+    <PackageReference Include="Nuget.Resolver" Version="6.0.0" />
   </ItemGroup>
 
   <!-- ReSharper disable once UnknownProperty -->
   <ItemGroup Condition="'$(TargetFramework)'=='net462'">
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.2.4" />
-    <PackageReference Include="System.Memory" Version="4.5.4" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>