Attempted to update to latest DwC-A packages

Paul Joiner · Paul Joiner · commit 0545ea9058ea · 2022-11-14T16:52:58.000-06:00
Minor code cleanup
diff --git a/NuGet.config b/NuGet.config
@@ -2,5 +2,11 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
+    <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
+    <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
+    <add key="MachineLearning" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/MachineLearning/nuget/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/src/DwC-A_dotnet.Interactive/Commands/DwcaCodegenCommand.cs b/src/DwC-A_dotnet.Interactive/Commands/DwcaCodegenCommand.cs
@@ -60,11 +60,11 @@ private static async Task GenerateClass(KernelInvocationContext context,
             IFileReader fileReader, 
             IGeneratorConfiguration config)
         {
-            var classGenerator = new ClassGenerator();
             var className = Path.GetFileNameWithoutExtension(fileReader.FileName);
             className = char.ToUpper(className[0]) + className[1..];
             context.Display($"Generating class {className}", new[] { "text/html" });
-            var source = classGenerator.GenerateFile(fileReader.FileMetaData, config);
+            var source = new ClassGenerator()
+                .GenerateFile(fileReader.FileMetaData, config);
             var result = await context.HandlingKernel.SubmitCodeAsync(source);
             result.KernelEvents.Subscribe((ev) => { }, (ex) =>
             {
diff --git a/src/DwC-A_dotnet.Interactive/DwC-A_dotnet.Interactive.csproj b/src/DwC-A_dotnet.Interactive/DwC-A_dotnet.Interactive.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>DwC_A.Interactive</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Copyright>Copyright © Paul Joiner 2021</Copyright>
@@ -17,10 +17,11 @@
     <FileVersion>0.1.10.0</FileVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageReadmeFile>README.md</PackageReadmeFile>
+    <NoWarn>NU5100</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DwC-A_dotnet" Version="0.6.2">
+    <PackageReference Include="DwC-A_dotnet" Version="0.7.0">
       <Aliases>Core</Aliases>
     </PackageReference>
     <PackageReference Include="DwC-A_dotnet.Mapping" Version="0.6.3" />
@@ -36,10 +37,7 @@
   
   <ItemGroup>
     <None Include="$(OutputPath)/DwC-A_dotnet.Interactive.dll" Pack="true" PackagePath="interactive-extensions/dotnet" />
-    <None Include="..\..\LICENSE">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
+    <None Include="..\..\LICENSE"  Pack="true" PackagePath="\" />
     <None Include="..\..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 </Project>
diff --git a/src/DwC-A_dotnet.Interactive/Formatters/ArchiveMetaData.cs b/src/DwC-A_dotnet.Interactive/Formatters/ArchiveMetaData.cs
@@ -24,13 +24,15 @@ public static void Register(Archive archive, TextWriter writer)
                 td("File Name"),
                 td("Row Type")
             });
-            var rows = new List<dynamic>();
-            rows.Add(tr(new[]
+            var rows = new List<dynamic>
             {
-                td(b("CoreFile")),
-                td(Path.GetFileName(archive.Core.Files.FirstOrDefault())),
-                td(archive.Core.RowType)
-            }));
+                tr(new[]
+                {
+                    td(b("CoreFile")),
+                    td(Path.GetFileName(archive.Core.Files.FirstOrDefault())),
+                    td(archive.Core.RowType)
+                })
+            };
             rows.AddRange(archive.Extension
                     .Select(e =>
                         tr(new[]
diff --git a/src/DwC-A_dotnet.Interactive/Formatters/TermsFormatter.cs b/src/DwC-A_dotnet.Interactive/Formatters/TermsFormatter.cs
@@ -25,7 +25,7 @@ public static void Register(DefaultTerms defaultTerms, TextWriter writer)
             foreach(var field in typeof(Terms).GetFields())
             {
                 var value = field.GetValue(null).ToString();
-                var description = dictionary.ContainsKey(value) ? dictionary[value] : "";
+                var description = dictionary.TryGetValue(value, out string descOut) ? descOut : "";
                 rows.Add(tr(new[]
                 {
                     td(field.Name),
diff --git a/src/DwC-A_dotnet.Interactive/Mapping/GeneratorConfigurationBuilder.cs b/src/DwC-A_dotnet.Interactive/Mapping/GeneratorConfigurationBuilder.cs
@@ -13,11 +13,11 @@ public class GeneratorConfigurationBuilder
 
         internal class GeneratorConfiguration : IGeneratorConfiguration
         {
-            private Dictionary<string, PropertyConfiguration> properties = new Dictionary<string, PropertyConfiguration>()
+            private readonly Dictionary<string, PropertyConfiguration> properties = new()
             {
                 { AllTerms, new PropertyConfiguration() }
             };
-            private HashSet<string> usings = new HashSet<string>(new[] { SystemNamespace });
+            private readonly HashSet<string> usings = new(new[] { SystemNamespace });
             public string Namespace { get; set; } = "";
             public string Output { get; set; } = "";
             public bool PascalCase { get; set; } = true;
@@ -27,8 +27,7 @@ internal class GeneratorConfiguration : IGeneratorConfiguration
             public IList<string> Usings => usings.ToList();
             public PropertyConfiguration GetPropertyConfiguration(string term)
             {
-                return Properties.ContainsKey(term) ? 
-                    Properties[term] : 
+                return Properties.TryGetValue(term, out PropertyConfiguration value) ? value : 
                     Properties[AllTerms];
             }
             internal void AddUsing(string namespaceName)
@@ -50,7 +49,7 @@ internal void AddProperty(string term, string typeName, bool include = true, str
             }
         }
 
-        private GeneratorConfiguration config = new GeneratorConfiguration();
+        private readonly GeneratorConfiguration config = new();
 
         public GeneratorConfigurationBuilder WithNamespace(string namespaceName)
         {
diff --git a/src/NuGet.config b/src/NuGet.config
diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@ private static async Task GenerateClass(KernelInvocationContext context,`
`60`	`60`	`IFileReader fileReader,`
`61`	`61`	`IGeneratorConfiguration config)`
`62`	`62`	`{`
`63`		`- var classGenerator = new ClassGenerator();`
`64`	`63`	`var className = Path.GetFileNameWithoutExtension(fileReader.FileName);`
`65`	`64`	`className = char.ToUpper(className[0]) + className[1..];`
`66`	`65`	`context.Display($"Generating class {className}", new[] { "text/html" });`
`67`		`- var source = classGenerator.GenerateFile(fileReader.FileMetaData, config);`
	`66`	`+ var source = new ClassGenerator()`
	`67`	`+ .GenerateFile(fileReader.FileMetaData, config);`
`68`	`68`	`var result = await context.HandlingKernel.SubmitCodeAsync(source);`
`69`	`69`	`result.KernelEvents.Subscribe((ev) => { }, (ex) =>`
`70`	`70`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static void Register(DefaultTerms defaultTerms, TextWriter writer)`
`25`	`25`	`foreach(var field in typeof(Terms).GetFields())`
`26`	`26`	`{`
`27`	`27`	`var value = field.GetValue(null).ToString();`
`28`		`- var description = dictionary.ContainsKey(value) ? dictionary[value] : "";`
	`28`	`+ var description = dictionary.TryGetValue(value, out string descOut) ? descOut : "";`
`29`	`29`	`rows.Add(tr(new[]`
`30`	`30`	`{`
`31`	`31`	`td(field.Name),`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ public class GeneratorConfigurationBuilder`
`13`	`13`
`14`	`14`	`internal class GeneratorConfiguration : IGeneratorConfiguration`
`15`	`15`	`{`
`16`		`- private Dictionary<string, PropertyConfiguration> properties = new Dictionary<string, PropertyConfiguration>()`
	`16`	`+ private readonly Dictionary<string, PropertyConfiguration> properties = new()`
`17`	`17`	`{`
`18`	`18`	`{ AllTerms, new PropertyConfiguration() }`
`19`	`19`	`};`
`20`		`- private HashSet<string> usings = new HashSet<string>(new[] { SystemNamespace });`
	`20`	`+ private readonly HashSet<string> usings = new(new[] { SystemNamespace });`
`21`	`21`	`public string Namespace { get; set; } = "";`
`22`	`22`	`public string Output { get; set; } = "";`
`23`	`23`	`public bool PascalCase { get; set; } = true;`
`@@ -27,8 +27,7 @@ internal class GeneratorConfiguration : IGeneratorConfiguration`
`27`	`27`	`public IList<string> Usings => usings.ToList();`
`28`	`28`	`public PropertyConfiguration GetPropertyConfiguration(string term)`
`29`	`29`	`{`
`30`		`- return Properties.ContainsKey(term) ?`
`31`		`- Properties[term] :`
	`30`	`+ return Properties.TryGetValue(term, out PropertyConfiguration value) ? value :`
`32`	`31`	`Properties[AllTerms];`
`33`	`32`	`}`
`34`	`33`	`internal void AddUsing(string namespaceName)`
`@@ -50,7 +49,7 @@ internal void AddProperty(string term, string typeName, bool include = true, str`
`50`	`49`	`}`
`51`	`50`	`}`
`52`	`51`
`53`		`- private GeneratorConfiguration config = new GeneratorConfiguration();`
	`52`	`+ private readonly GeneratorConfiguration config = new();`
`54`	`53`
`55`	`54`	`public GeneratorConfigurationBuilder WithNamespace(string namespaceName)`
`56`	`55`	`{`