Fixed warnings and updated to just .net standard

darrelmiller · darrelmiller · commit 672508eac5e2 · 2021-03-13T23:03:46.000-05:00
diff --git a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
@@ -1,10 +1,10 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net46; netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
         <PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET</PackageProjectUrl>
-        <PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/OpenAPI.NET/master/LICENSE</PackageLicenseUrl>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
         <Authors>Microsoft</Authors>
         <Company>Microsoft</Company>
@@ -26,17 +26,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="SharpYaml" Version="1.6.5" />
+        <PackageReference Include="SharpYaml" Version="1.6.6" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Reference Include="System.Net.Http" />
-    </ItemGroup>
-
     <ItemGroup>
         <Compile Update="Properties\Resource.Designer.cs">
             <DesignTime>True</DesignTime>
diff --git a/src/Microsoft.OpenApi.Readers/Services/DefaultStreamLoader.cs b/src/Microsoft.OpenApi.Readers/Services/DefaultStreamLoader.cs
@@ -2,11 +2,8 @@
 // Licensed under the MIT license. 
 
 using System;
-using System.Collections.Generic;
-using System.Net.Http;
 using System.IO;
-using System.Linq;
-using System.Text;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.OpenApi.Readers.Interface;
 
diff --git a/src/Microsoft.OpenApi.Readers/Services/OpenApiWorkspaceLoader.cs b/src/Microsoft.OpenApi.Readers/Services/OpenApiWorkspaceLoader.cs
@@ -15,8 +15,7 @@ internal class OpenApiWorkspaceLoader
     {
         private OpenApiWorkspace _workspace;
         private IStreamLoader _loader;
-        private OpenApiDiagnostic _diagnostics;
-        private OpenApiReaderSettings _readerSettings;
+        private readonly OpenApiReaderSettings _readerSettings;
 
         public OpenApiWorkspaceLoader(OpenApiWorkspace workspace, IStreamLoader loader, OpenApiReaderSettings readerSettings)
         {
diff --git a/src/Microsoft.OpenApi.Workbench/App.config b/src/Microsoft.OpenApi.Workbench/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
 </configuration>
diff --git a/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj b/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>Microsoft.OpenApi.Workbench</RootNamespace>
     <AssemblyName>Microsoft.OpenApi.Workbench</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
diff --git a/src/Microsoft.OpenApi.Workbench/Properties/Resources.Designer.cs b/src/Microsoft.OpenApi.Workbench/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.OpenApi.Workbench/Properties/Settings.Designer.cs b/src/Microsoft.OpenApi.Workbench/Properties/Settings.Designer.cs
diff --git a/src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs b/src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs
@@ -50,7 +50,6 @@ public static void SerializeAsYaml<T>(this T element, Stream stream, OpenApiSpec
         /// <param name="stream">The given stream.</param>
         /// <param name="specVersion">The Open API specification version.</param>
         /// <param name="format">The output format (JSON or YAML).</param>
-        /// <param name="settings">Provide configuration settings for controlling writing output</param>
         public static void Serialize<T>(
             this T element,
             Stream stream,
diff --git a/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj b/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
@@ -1,10 +1,10 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net46; netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
         <PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET</PackageProjectUrl>
-        <PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/OpenAPI.NET/master/LICENSE</PackageLicenseUrl>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
         <Authors>Microsoft</Authors>
         <Company>Microsoft</Company>
diff --git a/src/Microsoft.OpenApi/Services/OpenApiReferenceError.cs b/src/Microsoft.OpenApi/Services/OpenApiReferenceError.cs
@@ -11,6 +11,9 @@
 
 namespace Microsoft.OpenApi.Services
 {
+    /// <summary>
+    /// 
+    /// </summary>
     public class OpenApiReferenceError : OpenApiError
     {
         private OpenApiReference _reference;
@@ -21,6 +24,11 @@ public OpenApiReferenceError(OpenApiException exception) : base(exception.Pointe
         {
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="reference"></param>
+        /// <param name="message"></param>
         public OpenApiReferenceError(OpenApiReference reference, string message) : base("", message)
         {
             _reference = reference;
diff --git a/src/Microsoft.OpenApi/Writers/OpenApiYamlWriter.cs b/src/Microsoft.OpenApi/Writers/OpenApiYamlWriter.cs
@@ -28,6 +28,9 @@ public OpenApiYamlWriter(TextWriter textWriter, OpenApiWriterSettings settings)
            
         }
 
+        /// <summary>
+        /// Allow rendering of multi-line strings using YAML | syntax
+        /// </summary>
         public bool UseLiteralStyle { get; set; }
 
         /// <summary>
diff --git a/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj b/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net46;net461</TargetFrameworks>
+        <TargetFrameworks>net462</TargetFrameworks>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
         <Authors></Authors>
         <Company>Microsoft</Company>
@@ -242,16 +242,16 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-        <PackageReference Include="FluentAssertions" Version="5.10.0">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+        <PackageReference Include="FluentAssertions" Version="5.10.3">
         </PackageReference>
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3">
         </PackageReference>
-        <PackageReference Include="SharpYaml" Version="1.6.5">
+        <PackageReference Include="SharpYaml" Version="1.6.6">
         </PackageReference>
         <PackageReference Include="xunit" Version="2.4.1">
         </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiWorkspaceTests/OpenApiWorkspaceStreamTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiWorkspaceTests/OpenApiWorkspaceStreamTests.cs
@@ -94,7 +94,7 @@ public Stream Load(Uri uri)
             return null;
         }
 
-        public async Task<Stream> LoadAsync(Uri uri)
+        public Task<Stream> LoadAsync(Uri uri)
         {
             return null;
         }
@@ -108,11 +108,11 @@ public Stream Load(Uri uri)
             return null;
         }
 
-        public async Task<Stream> LoadAsync(Uri uri)
+        public Task<Stream> LoadAsync(Uri uri)
         {
             var path = new Uri(new Uri("http://example.org/V3Tests/Samples/OpenApiWorkspace/"), uri).AbsolutePath;
             path = path.Substring(1); // remove leading slash
-            return Resources.GetStream(path);
+            return Task.FromResult(Resources.GetStream(path));
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj b/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj
@@ -1,18 +1,18 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;net461</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;net46</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;net462</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj b/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj
@@ -1,6 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net46;net461</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors></Authors>
     <Company>Microsoft</Company>
     <Product>Microsoft.OpenApi.Tests</Product>
@@ -14,17 +15,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="FluentAssertions" Version="5.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="SharpYaml" Version="1.6.5" />
+    <PackageReference Include="SharpYaml" Version="1.6.6" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="PublicApiGenerator" Version="9.3.0" />
+    <PackageReference Include="PublicApiGenerator" Version="10.2.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt b/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt
diff --git a/test/Microsoft.OpenApi.Tests/PublicApi/PublicApiTests.cs b/test/Microsoft.OpenApi.Tests/PublicApi/PublicApiTests.cs

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@ internal class OpenApiWorkspaceLoader`
`15`	`15`	`{`
`16`	`16`	`private OpenApiWorkspace _workspace;`
`17`	`17`	`private IStreamLoader _loader;`
`18`		`- private OpenApiDiagnostic _diagnostics;`
`19`		`- private OpenApiReaderSettings _readerSettings;`
	`18`	`+ private readonly OpenApiReaderSettings _readerSettings;`
`20`	`19`
`21`	`20`	`public OpenApiWorkspaceLoader(OpenApiWorkspace workspace, IStreamLoader loader, OpenApiReaderSettings readerSettings)`
`22`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace Microsoft.OpenApi.Services`
`13`	`13`	`{`
	`14`	`+ /// <summary>`
	`15`	`+ ///`
	`16`	`+ /// </summary>`
`14`	`17`	`public class OpenApiReferenceError : OpenApiError`
`15`	`18`	`{`
`16`	`19`	`private OpenApiReference _reference;`
`@@ -21,6 +24,11 @@ public OpenApiReferenceError(OpenApiException exception) : base(exception.Pointe`
`21`	`24`	`{`
`22`	`25`	`}`
`23`	`26`
	`27`	`+ /// <summary>`
	`28`	`+ ///`
	`29`	`+ /// </summary>`
	`30`	`+ /// <param name="reference"></param>`
	`31`	`+ /// <param name="message"></param>`
`24`	`32`	`public OpenApiReferenceError(OpenApiReference reference, string message) : base("", message)`
`25`	`33`	`{`
`26`	`34`	`_reference = reference;`