Address merge conflicts

octokit · Mar 7, 2024 · cb2bc9e · cb2bc9e
1 parent 3f9ede8
commit cb2bc9e
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 24 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -152,7 +152,7 @@ csharp_space_between_parentheses = false
 csharp_space_between_square_brackets = false
 
 # License header
-file_header_template = Copyright (c) GitHub 2023-2024 — Licensed as MIT.
+file_header_template = Copyright (c) GitHub 2023-2024 - Licensed as MIT.
 
 # C++ Files
 [*.{cpp,h,in}]

diff --git a/src/Authentication/TokenAuthenticationProvider.cs b/src/Authentication/TokenAuthenticationProvider.cs
@@ -1,4 +1,4 @@
-// Copyright (c) GitHub 2023-2024 — Licensed as MIT.
+// Copyright (c) GitHub 2023-2024 - Licensed as MIT.
 
 using Microsoft.Kiota.Abstractions;
 using Microsoft.Kiota.Abstractions.Authentication;

diff --git a/src/Client/ClientFactory.cs b/src/Client/ClientFactory.cs
@@ -1,4 +1,4 @@
-// Copyright (c) GitHub 2023-2024 — Licensed as MIT.
+// Copyright (c) GitHub 2023-2024 - Licensed as MIT.
 
 using System.Net;
 using GitHub.Octokit.Client.Middleware;

diff --git a/src/Client/RequestAdapter.cs b/src/Client/RequestAdapter.cs
@@ -1,4 +1,4 @@
-// Copyright (c) GitHub 2023-2024 — Licensed as MIT.
+// Copyright (c) GitHub 2023-2024 - Licensed as MIT.
 
 using Microsoft.Kiota.Abstractions.Authentication;
 using Microsoft.Kiota.Http.HttpClientLibrary;

diff --git a/src/GitHub.Octokit.SDK.csproj b/src/GitHub.Octokit.SDK.csproj
@@ -15,9 +15,9 @@
     <Authors>GitHub</Authors>
     <PackageTags>GitHub API Octokit dotnet-core</PackageTags>
     <RepositoryUrl>https://github.com/octokit/dotnet-sdk</RepositoryUrl>
-		<PackageProjectUrl>https://github.com/octokit/dotnet-sdk</PackageProjectUrl>
-		<PackageIcon>octokit.png</PackageIcon>
-		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/octokit/dotnet-sdk</PackageProjectUrl>
+    <PackageIcon>octokit.png</PackageIcon>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageReadmeFile>NugetREADME.md</PackageReadmeFile>
     <Copyright>Copyright (c) GitHub 2023-2024</Copyright>
   </PropertyGroup>

diff --git a/src/Middleware/APIVersionHandler.cs b/src/Middleware/APIVersionHandler.cs
@@ -1,4 +1,4 @@
-// Copyright (c) GitHub 2023-2024 — Licensed as MIT.
+// Copyright (c) GitHub 2023-2024 - Licensed as MIT.
 
 using GitHub.Octokit.Client.Middleware.Options;
 using Microsoft.Kiota.Http.HttpClientLibrary.Extensions;

diff --git a/src/Middleware/Options/APIVersionOptions.cs b/src/Middleware/Options/APIVersionOptions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) GitHub 2023-2024 — Licensed as MIT.
+// Copyright (c) GitHub 2023-2024 - Licensed as MIT.
 
 using Microsoft.Kiota.Abstractions;
 

diff --git a/src/Middleware/Options/UserAgentOptions.cs b/src/Middleware/Options/UserAgentOptions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) GitHub 2023-2024 — Licensed as MIT.
+// Copyright (c) GitHub 2023-2024 - Licensed as MIT.
 
 using Microsoft.Kiota.Abstractions;
 

diff --git a/src/Middleware/UserAgentHandler.cs b/src/Middleware/UserAgentHandler.cs
@@ -1,4 +1,4 @@
-// Copyright (c) GitHub 2023-2024 — Licensed as MIT.
+// Copyright (c) GitHub 2023-2024 - Licensed as MIT.
 
 using System.Net.Http.Headers;
 using GitHub.Octokit.Client.Middleware.Options;

diff --git a/test/Authentication/TokenAuthenticationProviderTest.cs b/test/Authentication/TokenAuthenticationProviderTest.cs
@@ -1,3 +1,5 @@
+// Copyright (c) GitHub 2023-2024 - Licensed as MIT.
+
 using GitHub.Octokit.Authentication;
 using Microsoft.Kiota.Abstractions;
 using Xunit;

diff --git a/test/Client/ClientFactoryTest.cs b/test/Client/ClientFactoryTest.cs
@@ -1,14 +1,14 @@
+// Copyright (c) GitHub 2023-2024 - Licensed as MIT.
+
 using GitHub.Octokit.Client;
 using GitHub.Octokit.Client.Middleware;
 using Xunit;
 
-
 public class TestHandler1 : DelegatingHandler { }
 public class TestHandler2 : DelegatingHandler { }
 
 public class ClientFactoryTests
 {
-
     [Fact]
     public void Creates_Client_With_Default_Timeout()
     {
@@ -59,7 +59,4 @@ public void GetDefaultHttpMessageHandler_Returns_NonNullHttpMessageHandler()
         var handler = ClientFactory.GetDefaultHttpMessageHandler();
         Assert.NotNull(handler);
     }
-
 }
-
-
diff --git a/test/Client/RequestAdaptorTest.cs b/test/Client/RequestAdaptorTest.cs
@@ -1,12 +1,11 @@
-// Copyright (c) GitHub 2023-2024 — Licensed as MIT.
+// Copyright (c) GitHub 2023-2024 - Licensed as MIT.
 
 using GitHub.Octokit.Authentication;
 using GitHub.Octokit.Client;
 using Xunit;
 
 public class RequestAdapterTests
 {
-
     [Fact]
     public void Creates_RequestAdaptor_With_Defaults()
     {
@@ -29,5 +28,4 @@ public void Creates_RequestAdaptor_With_ClientFactory()
         var requestAdapter = RequestAdapter.Create(new TokenAuthenticationProvider("Octokit.Gen", "JRRTOLKIEN"), clientFactory);
         Assert.NotNull(requestAdapter);
     }
-
 }
diff --git a/test/Tests.csproj b/test/Tests.csproj
@@ -43,11 +43,6 @@
     <PackageReference Include="Moq" Version="4.20.70" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\src\GitHub.Octokit.SDK.csproj" />
   </ItemGroup>