reverted all structured logger related changes

ably · Apr 11, 2024 · 58b5dc0 · 58b5dc0
1 parent 54a5a46
commit 58b5dc0
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 126 deletions.
diff --git a/build-script/build-script.fsproj b/build-script/build-script.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>build_script</RootNamespace>
     <WarnOn>3390;$(WarnOn)</WarnOn>
     <NoWarn>0020</NoWarn>

diff --git a/build-script/build.fs b/build-script/build.fs
@@ -366,10 +366,7 @@ let initTargets (argv) =
             (fun opts ->
                 { opts with
                     Configuration = configuration
-                    MSBuildParams =
-                        { opts.MSBuildParams with
-                            Properties = [ "DefineConstants", compilationConstant ]
-                            DisableInternalBinLog = true } })
+                    MSBuildParams = { opts.MSBuildParams with Properties = [ "DefineConstants", compilationConstant ] } })
             NetStandardSolution)
 
     Target.create "NetStandard - Unit Tests" (fun _ -> runStandardTests UnitTests |> ignore)

diff --git a/build-script/paket.dependencies b/build-script/paket.dependencies
@@ -8,4 +8,3 @@ nuget Fake.DotNet.Cli
 nuget Fake.DotNet.Testing.XUnit2
 nuget Microsoft.Build 17.3.2
 nuget Microsoft.Build.Tasks.Core 17.3.2
-nuget MSBuild.StructuredLogger
diff --git a/build-script/paket.lock b/build-script/paket.lock
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.305",
-    "rollForward": "disable"
+    "version": "6.0.300",
+    "rollForward": "latestMajor"
   }
 }
diff --git a/src/IO.Ably.NETFramework/IO.Ably.NETFramework.csproj b/src/IO.Ably.NETFramework/IO.Ably.NETFramework.csproj
@@ -26,9 +26,8 @@
     <WarningLevel>4</WarningLevel>
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <CodeAnalysisRuleSet>..\IO.Ably.ruleset</CodeAnalysisRuleSet>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DocumentationFile>bin\Debug\IO.Ably.xml</DocumentationFile>
-    <NoWarn>NU1903</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -109,4 +108,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\build\Microsoft.CodeQuality.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\build\Microsoft.CodeQuality.Analyzers.props'))" />
   </Target>
-</Project>
+</Project>
diff --git a/src/IO.Ably.NETStandard20/IO.Ably.NETStandard20.csproj b/src/IO.Ably.NETStandard20/IO.Ably.NETStandard20.csproj
@@ -23,61 +23,15 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DocumentationFile>bin\Debug\IO.Ably.NETStandard20.xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DocumentationFile>bin\Release\IO.Ably.NETStandard20.xml</DocumentationFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
-    <WarningsNotAsErrors>NU1903;</WarningsNotAsErrors>
-    <NoWarn>1701;1702;NU1903;</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
-    <WarningsNotAsErrors>NU1903;</WarningsNotAsErrors>
-    <NoWarn>1701;1702;NU1903;</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='package|netstandard2.0|AnyCPU'">
-    <WarningsNotAsErrors>NU1903;</WarningsNotAsErrors>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <NoWarn>1701;1702;NU1903;</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
-    <WarningsNotAsErrors>NU1903;</WarningsNotAsErrors>
-    <NoWarn>1701;1702;NU1903;</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
-    <WarningsNotAsErrors>NU1903;</WarningsNotAsErrors>
-    <NoWarn>1701;1702;NU1903;</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='package|net6.0|AnyCPU'">
-    <WarningsNotAsErrors>NU1903;</WarningsNotAsErrors>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <NoWarn>1701;1702;NU1903;</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0|AnyCPU'">
-    <WarningsNotAsErrors>NU1903;</WarningsNotAsErrors>
-    <NoWarn>1701;1702;NU1903;</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0|AnyCPU'">
-    <WarningsNotAsErrors>NU1903;</WarningsNotAsErrors>
-    <NoWarn>1701;1702;NU1903;</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='package|net7.0|AnyCPU'">
-    <WarningsNotAsErrors>NU1903;</WarningsNotAsErrors>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <NoWarn>1701;1702;NU1903;</NoWarn>
-  </PropertyGroup>
-
   <Import Project="..\IO.Ably.Shared\IO.Ably.Shared.projitems" Label="Shared" />
 
   <Import Project="..\IO.Ably.Shared.MsgPack\IO.Ably.Shared.MsgPack.projitems" Label="Shared" Condition="$(DefineConstants.Contains(MSGPACK))" />