Merge pull request #4 from FantasyTeddy/small-improvements

Small improvements
supabase-community · Jan 5, 2024 · 4605d4e · 4605d4e
2 parents 165ad39 + c913210
commit 4605d4e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 28 deletions.
diff --git a/Functions/Functions.csproj b/Functions/Functions.csproj
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
@@ -23,36 +22,26 @@
 		<PackageIcon>icon.png</PackageIcon>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<RepositoryUrl>https://github.com/supabase-community/functions-csharp</RepositoryUrl>
-	</PropertyGroup>
-	<PropertyGroup>
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-	</PropertyGroup>
-	<PropertyGroup>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-	</PropertyGroup>
-	<PropertyGroup>
 		<Nullable>enable</Nullable>
 		<LangVersion>8.0</LangVersion>
 		<WarningsAsErrors>CS8600;CS8602;CS8603</WarningsAsErrors>
 	</PropertyGroup>
+
 	<PropertyGroup Condition=" '$(Version)' == '' ">
 		<VersionPrefix Condition=" '$(VersionPrefix)' == '' ">1.3.1</VersionPrefix>
-		<VersionSuffix Condition=" '$(VersionSuffix)' == '' ">
-		</VersionSuffix>
+		<VersionSuffix Condition=" '$(VersionSuffix)' == '' "></VersionSuffix>
 		<Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
 		<Version Condition=" '$(Version)' == '' ">$(VersionPrefix)</Version>
 	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<LangVersion>8.0</LangVersion>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<LangVersion>8.0</LangVersion>
-	</PropertyGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="supabase-core" Version="0.0.3" />
 	</ItemGroup>
+
 	<ItemGroup>
 		<None Include="..\.github\icon.png" Pack="true" Link="icon.png" PackagePath="\" />
 		<None Include="..\README.md" Pack="true" Link="README.md" PackagePath="\" />

diff --git a/FunctionsTests/ClientTests.cs b/FunctionsTests/ClientTests.cs
@@ -13,8 +13,8 @@ namespace FunctionsTests
     [TestClass]
     public class ClientTests
     {
-        Client _client;
-        string _token;
+        private Client _client = null!;
+        private string _token = null!;
 
         [TestInitialize]
         public void Initialize()

diff --git a/FunctionsTests/FunctionsTests.csproj b/FunctionsTests/FunctionsTests.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
-    <ReleaseVersion>1.2.1</ReleaseVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.31.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.0.4" />
     <PackageReference Include="MSTest.TestFramework" Version="3.0.4" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-<PrivateAssets>all</PrivateAssets>
-</PackageReference>
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.31.0" />
   </ItemGroup>
 

diff --git a/functions-csharp.sln b/functions-csharp.sln
@@ -17,8 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{D620
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{11445079-7FD7-4A84-972D-328B82AF1238}"
 	ProjectSection(SolutionItems) = preProject
+		.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
 		.github\workflows\build-documentation.yaml = .github\workflows\build-documentation.yaml
-		.github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml
 		.github\workflows\release.yml = .github\workflows\release.yml
 	EndProjectSection
 EndProject
@@ -40,6 +40,10 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{D6201965-1A00-435E-965B-B0D66E74F33B} = {228693BB-A395-4123-93E8-5299FF875615}
+		{11445079-7FD7-4A84-972D-328B82AF1238} = {D6201965-1A00-435E-965B-B0D66E74F33B}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3CB8EBAC-5D93-461A-8D2D-B83A69E49B4B}
 	EndGlobalSection
@@ -50,8 +54,4 @@ Global
 		$0.VersionControlPolicy = $2
 		version = 2.4.0
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{D6201965-1A00-435E-965B-B0D66E74F33B} = {228693BB-A395-4123-93E8-5299FF875615}
-		{11445079-7FD7-4A84-972D-328B82AF1238} = {D6201965-1A00-435E-965B-B0D66E74F33B}
-	EndGlobalSection
 EndGlobal