From f84c4b2d31fc980b7fee8432df0cd480d1b8ed0e Mon Sep 17 00:00:00 2001 From: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com> Date: Thu, 14 Nov 2024 21:16:46 +0000 Subject: [PATCH] Bump SDK and enforce msbuild warnings (#379) * Bump SDK * Updated Tekla structures nugets * Tekla architecture targeting * Fixed remaining warnings --- .github/workflows/ci.yml | 4 +- .github/workflows/main.yml | 4 +- Build/Program.cs | 5 +- ...sri.ArcGISPro.Extensions30.Speckle.targets | 4 +- .../Speckle.Connector.Tekla2023.csproj | 9 +- .../packages.lock.json | 112 ++++++------------ .../Speckle.Connector.Tekla2024.csproj | 1 + .../Speckle.Converter.Tekla2023.csproj | 4 +- .../packages.lock.json | 104 +++++----------- Directory.Packages.props | 2 +- Sdk/Speckle.Connectors.Logging/Consts.cs | 2 +- .../Internal/MetricsBuilder.cs | 5 +- .../Internal/TracingBuilder.cs | 5 +- .../Speckle.Connectors.Logging.csproj | 2 +- .../packages.lock.json | 38 +----- global.json | 2 +- 16 files changed, 99 insertions(+), 204 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3a92d05a..de49f378b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules) + dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules) - name: Cache Nuget uses: actions/cache@v4 @@ -38,7 +38,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules) + dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules) - name: Cache Nuget uses: actions/cache@v4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 71449e8e4..43b5b7a41 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules) + dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules) - name: Cache Nuget uses: actions/cache@v4 @@ -79,7 +79,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules) + dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules) - name: Cache Nuget uses: actions/cache@v4 diff --git a/Build/Program.cs b/Build/Program.cs index dba17b3a1..8604c198c 100644 --- a/Build/Program.cs +++ b/Build/Program.cs @@ -150,7 +150,10 @@ void RemoveDirectory(string d) var version = Environment.GetEnvironmentVariable("GitVersion_FullSemVer") ?? "3.0.0-localBuild"; var fileVersion = Environment.GetEnvironmentVariable("GitVersion_AssemblySemFileVer") ?? "3.0.0.0"; Console.WriteLine($"Version: {version} & {fileVersion}"); - Run("dotnet", $"build {s} -c Release --no-restore -p:Version={version} -p:FileVersion={fileVersion} -v:m"); + Run( + "dotnet", + $"build {s} -c Release --no-restore -warnaserror -p:Version={version} -p:FileVersion={fileVersion} -v:m" + ); } ); diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Esri.ArcGISPro.Extensions30.Speckle.targets b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Esri.ArcGISPro.Extensions30.Speckle.targets index 7f7e5427e..3c80fa76f 100644 --- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Esri.ArcGISPro.Extensions30.Speckle.targets +++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Esri.ArcGISPro.Extensions30.Speckle.targets @@ -154,7 +154,6 @@ Log.LogErrorFromException(ex); return false; } - return Success; ]]> @@ -190,7 +189,7 @@ { Log.LogMessage(MessageImportance.Low, "RelativePaths: " + i.ToString()); } - return true; + Success = true; ]]> @@ -266,7 +265,6 @@ CleanInfo = AssemblyName + extension; } Success = true; - return Success; ]]> diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj b/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj index b3fcb0edd..2739dcef3 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj +++ b/Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj @@ -2,6 +2,7 @@ net48 + x64 2023 true $(DefineConstants);TEKLA2023 @@ -33,10 +34,10 @@ - - - - + + + + diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json index bd8f3e6ff..e252d14a8 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json +++ b/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json @@ -44,61 +44,49 @@ }, "Tekla.Structures.Dialog": { "type": "Direct", - "requested": "[2023.0.0, )", - "resolved": "2023.0.0", - "contentHash": "DPwrFnmhnaQJT0HmuormXow/b0jgyUSJ6llW1If8Vp8EQJlk/+VyelwqTFGCE3kNQrw0BPGvZ/fgUYaxjHcfdw==", + "requested": "[2023.0.1, )", + "resolved": "2023.0.1", + "contentHash": "gtU7dwMvnGe1+JnERp4ve6vHAIX55zNDg4VpoPKNMH75s8eV8qVPYD3ThFj9mhAylFPaQWVohXIqHXpNaDSJ5A==", "dependencies": { - "Tekla.Structures": "2023.0.0", - "Tekla.Structures.Catalogs": "2023.0.0", - "Tekla.Structures.Datatype": "2023.0.0", - "Tekla.Structures.Model": "2023.0.0", - "Tekla.Structures.Plugins": "2023.0.0" + "Tekla.Structures": "2023.0.1", + "Tekla.Structures.Catalogs": "2023.0.1", + "Tekla.Structures.Datatype": "2023.0.1", + "Tekla.Structures.Model": "2023.0.1", + "Tekla.Structures.Plugins": "2023.0.1" } }, "Tekla.Structures.Drawing": { "type": "Direct", - "requested": "[2023.0.0, )", - "resolved": "2023.0.0", - "contentHash": "22WqaO0GKxFOOEctU92ZmNCSzNJGjFwzDC/Px0+4Iimh6A3WL5Z7lvYSUhyCeF64YA7QbvK5PZKrtdhrB7Illg==", + "requested": "[2023.0.1, )", + "resolved": "2023.0.1", + "contentHash": "YAOYc0L1Tvjls1tFlpUTmLE2K3urq4XSxtxa2UtX6hC7XDiblRmwJTXAcBeiQ/mbB67k//WH8wh7QR/2h5nBAQ==", "dependencies": { - "DotNetZip": "1.13.7", - "Newtonsoft.Json": "13.0.1", - "Tekla.Structures": "2023.0.0", - "Tekla.Structures.Datatype": "2023.0.0", - "Tekla.Structures.Dialog": "2023.0.0", - "Tekla.Structures.Model": "2023.0.0", - "Tekla.Structures.Plugins": "2023.0.0", - "Tekla.Technology.Akit5": "5.8.17235.1", - "Tekla.Technology.Scripting": "5.0.20041" + "Tekla.Structures": "2023.0.1", + "Tekla.Structures.Datatype": "2023.0.1", + "Tekla.Structures.Dialog": "2023.0.1", + "Tekla.Structures.Model": "2023.0.1", + "Tekla.Structures.Plugins": "2023.0.1" } }, "Tekla.Structures.Model": { "type": "Direct", - "requested": "[2023.0.0, )", - "resolved": "2023.0.0", - "contentHash": "dkw8cA4kqE/Jc6WAq8Zrzcn49Vs7kh0YNXuEBpcx6J76lv6jSl4n+EsIvxE8NEBJnEHsGoG67uLTaTkiKAmuXQ==", + "requested": "[2023.0.1, )", + "resolved": "2023.0.1", + "contentHash": "99e9lyTcW+Me4c4wUKqLbXoxHusPGSeBJGf01Upzg2lzXzaw5pUmVxEikNvievoN9Qt3Y09NTvhuL87UML7OIQ==", "dependencies": { - "Tekla.Structures": "2023.0.0", - "Tekla.Structures.Datatype": "2023.0.0" + "Tekla.Structures": "2023.0.1", + "Tekla.Structures.Datatype": "2023.0.1" } }, "Tekla.Structures.Plugins": { "type": "Direct", - "requested": "[2023.0.0, )", - "resolved": "2023.0.0", - "contentHash": "8mD7XoH03QnHTTkHHICjdXJk8MrvhMNt74LmwtiYgYm/bF7TErGIzDEyl/MFgBPjji9m2I+mUJmCUvOde+A6NQ==", + "requested": "[2023.0.1, )", + "resolved": "2023.0.1", + "contentHash": "Wap1V8Fri3VAirfX51tqaQk6yPqPGj9Y9Y2FGPdyXg+7wZy+S1H+3DxtzEmh7ZuCHqCv5gIP0r+1yLE9fcjHdw==", "dependencies": { - "Tekla.Structures": "2023.0.0", - "Tekla.Technology.Akit5": "5.8.17235.1", - "Tekla.Technology.Scripting": "5.0.20041", - "Tekla.Technology.Scripting.Plugins": "5.3.17206" + "Tekla.Structures": "2023.0.1" } }, - "DotNetZip": { - "type": "Transitive", - "resolved": "1.13.7", - "contentHash": "MGXK1jFJlxCWId2xcXnEdUov7M1oSMk+Gc/rF1psLOoqWNhCkfCqAIhIk1rSxeRCAGRt7JztQRMLC+DTapxc6g==" - }, "GraphQL.Client": { "type": "Transitive", "resolved": "6.0.0", @@ -224,16 +212,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Mono.Cecil": { - "type": "Transitive", - "resolved": "0.9.6.1", - "contentHash": "yMsurNaOxxKIjyW9pEB+tRrR1S3DFnN1+iBgKvYvXG8kW0Y6yknJeMAe/tl3+P78/2C6304TgF7aVqpqXgEQ9Q==" - }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.1", - "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -331,41 +309,23 @@ }, "Tekla.Structures": { "type": "Transitive", - "resolved": "2023.0.0", - "contentHash": "tSO+SQZMoxA25t0a0SZj4U3Nw44nUdS/XetSZGUky1j0OYiHUOuA6EGMq+NMUapRJlWfL9lmlPOPPmVvVVHluQ==" + "resolved": "2023.0.1", + "contentHash": "M+3JfeWQsgYH3Lukhkfb/7nDOuANymde1HBYeyv+qG98vuIsgiU6u66vJv3XXiYM2islRodCBn7+ZI3vaJ1Tug==" }, "Tekla.Structures.Catalogs": { "type": "Transitive", - "resolved": "2023.0.0", - "contentHash": "CMzgDBTeVOYGCQfpzJxjnkSZ7h64PWR/CcIQCC5W3vU8xokV4vR4XFp7ecU/ckz7olex9IZE1xmSGaC0LCXYQA==", + "resolved": "2023.0.1", + "contentHash": "jrsQDTiy/Xy72rI/s+olNzgN98WEDAcAj4TPT5opM0dvcnqMlf3uEGrEOKciO4tjSTmKfL9EJ8GZODsARKgKpw==", "dependencies": { - "Tekla.Structures": "2023.0.0", - "Tekla.Structures.Datatype": "2023.0.0", - "Tekla.Structures.Model": "2023.0.0" + "Tekla.Structures": "2023.0.1", + "Tekla.Structures.Datatype": "2023.0.1", + "Tekla.Structures.Model": "2023.0.1" } }, "Tekla.Structures.Datatype": { "type": "Transitive", - "resolved": "2023.0.0", - "contentHash": "5q/7OvUTFgJrXfkcUrrRzF5yJqxHuVyFZvf1M5smC/RgF5zFqJsfUXxxFlhk03pc0pu+f6cD/QjRTVopAMU9Aw==" - }, - "Tekla.Technology.Akit5": { - "type": "Transitive", - "resolved": "5.8.17235.1", - "contentHash": "MVvgt7lcJDYj9xqyZfVIfXXCUKodIL+F3y3Rvp7rc/46ukTzEtwuiW+IIlId1IQqtO3/WCZBPBQmBxfwhx9sFA==" - }, - "Tekla.Technology.Scripting": { - "type": "Transitive", - "resolved": "5.0.20041", - "contentHash": "PXD4j7++eEWxmL7K7JxqEcwLmIfjDgbM4DsA1m9iw9NcSWj3DAx4V/luWRfEcUTYvV0cRgD6/nGoiCQQTVbiZQ==" - }, - "Tekla.Technology.Scripting.Plugins": { - "type": "Transitive", - "resolved": "5.3.17206", - "contentHash": "GbdMWQjGufzB637bzfoQiP5N+MCbuTs5WqBEyOLvY7dA22zkKlwnwoPnW3Hy2hXPGhywNlcKmWCn4oKOcj22Uw==", - "dependencies": { - "Mono.Cecil": "0.9.6.1" - } + "resolved": "2023.0.1", + "contentHash": "24KbR++C2WYEIyDymIHX/AVuHYcgwyQrvgExMKDnMobQPNM+AmMNnwdyYxBbw4AvYXd8QHoi+lmmavhTCL8E3w==" }, "speckle.connectors.common": { "type": "Project", @@ -401,8 +361,8 @@ "type": "Project", "dependencies": { "Speckle.Converters.Common": "[1.0.0, )", - "Tekla.Structures.Drawing": "[2023.0.0, )", - "Tekla.Structures.Model": "[2023.0.0, )" + "Tekla.Structures.Drawing": "[2023.0.1, )", + "Tekla.Structures.Model": "[2023.0.1, )" } }, "speckle.converters.common": { diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj b/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj index e25666ed0..b391f3023 100644 --- a/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj +++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj @@ -2,6 +2,7 @@ net48 + x64 2024 true $(DefineConstants);TEKLA2024 diff --git a/Converters/Tekla/Speckle.Converter.Tekla2023/Speckle.Converter.Tekla2023.csproj b/Converters/Tekla/Speckle.Converter.Tekla2023/Speckle.Converter.Tekla2023.csproj index 2090a6391..0c6c2d77f 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2023/Speckle.Converter.Tekla2023.csproj +++ b/Converters/Tekla/Speckle.Converter.Tekla2023/Speckle.Converter.Tekla2023.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json b/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json index ab82fcf09..120a0b1ca 100644 --- a/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json +++ b/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json @@ -35,36 +35,27 @@ }, "Tekla.Structures.Drawing": { "type": "Direct", - "requested": "[2023.0.0, )", - "resolved": "2023.0.0", - "contentHash": "22WqaO0GKxFOOEctU92ZmNCSzNJGjFwzDC/Px0+4Iimh6A3WL5Z7lvYSUhyCeF64YA7QbvK5PZKrtdhrB7Illg==", + "requested": "[2023.0.1, )", + "resolved": "2023.0.1", + "contentHash": "YAOYc0L1Tvjls1tFlpUTmLE2K3urq4XSxtxa2UtX6hC7XDiblRmwJTXAcBeiQ/mbB67k//WH8wh7QR/2h5nBAQ==", "dependencies": { - "DotNetZip": "1.13.7", - "Newtonsoft.Json": "13.0.1", - "Tekla.Structures": "2023.0.0", - "Tekla.Structures.Datatype": "2023.0.0", - "Tekla.Structures.Dialog": "2023.0.0", - "Tekla.Structures.Model": "2023.0.0", - "Tekla.Structures.Plugins": "2023.0.0", - "Tekla.Technology.Akit5": "5.8.17235.1", - "Tekla.Technology.Scripting": "5.0.20041" + "Tekla.Structures": "2023.0.1", + "Tekla.Structures.Datatype": "2023.0.1", + "Tekla.Structures.Dialog": "2023.0.1", + "Tekla.Structures.Model": "2023.0.1", + "Tekla.Structures.Plugins": "2023.0.1" } }, "Tekla.Structures.Model": { "type": "Direct", - "requested": "[2023.0.0, )", - "resolved": "2023.0.0", - "contentHash": "dkw8cA4kqE/Jc6WAq8Zrzcn49Vs7kh0YNXuEBpcx6J76lv6jSl4n+EsIvxE8NEBJnEHsGoG67uLTaTkiKAmuXQ==", + "requested": "[2023.0.1, )", + "resolved": "2023.0.1", + "contentHash": "99e9lyTcW+Me4c4wUKqLbXoxHusPGSeBJGf01Upzg2lzXzaw5pUmVxEikNvievoN9Qt3Y09NTvhuL87UML7OIQ==", "dependencies": { - "Tekla.Structures": "2023.0.0", - "Tekla.Structures.Datatype": "2023.0.0" + "Tekla.Structures": "2023.0.1", + "Tekla.Structures.Datatype": "2023.0.1" } }, - "DotNetZip": { - "type": "Transitive", - "resolved": "1.13.7", - "contentHash": "MGXK1jFJlxCWId2xcXnEdUov7M1oSMk+Gc/rF1psLOoqWNhCkfCqAIhIk1rSxeRCAGRt7JztQRMLC+DTapxc6g==" - }, "GraphQL.Client": { "type": "Transitive", "resolved": "6.0.0", @@ -190,16 +181,6 @@ "resolved": "8.0.0", "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" }, - "Mono.Cecil": { - "type": "Transitive", - "resolved": "0.9.6.1", - "contentHash": "yMsurNaOxxKIjyW9pEB+tRrR1S3DFnN1+iBgKvYvXG8kW0Y6yknJeMAe/tl3+P78/2C6304TgF7aVqpqXgEQ9Q==" - }, - "Newtonsoft.Json": { - "type": "Transitive", - "resolved": "13.0.1", - "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" - }, "Speckle.DoubleNumerics": { "type": "Transitive", "resolved": "4.0.1", @@ -297,41 +278,23 @@ }, "Tekla.Structures": { "type": "Transitive", - "resolved": "2023.0.0", - "contentHash": "tSO+SQZMoxA25t0a0SZj4U3Nw44nUdS/XetSZGUky1j0OYiHUOuA6EGMq+NMUapRJlWfL9lmlPOPPmVvVVHluQ==" + "resolved": "2023.0.1", + "contentHash": "M+3JfeWQsgYH3Lukhkfb/7nDOuANymde1HBYeyv+qG98vuIsgiU6u66vJv3XXiYM2islRodCBn7+ZI3vaJ1Tug==" }, "Tekla.Structures.Catalogs": { "type": "Transitive", - "resolved": "2023.0.0", - "contentHash": "CMzgDBTeVOYGCQfpzJxjnkSZ7h64PWR/CcIQCC5W3vU8xokV4vR4XFp7ecU/ckz7olex9IZE1xmSGaC0LCXYQA==", + "resolved": "2023.0.1", + "contentHash": "jrsQDTiy/Xy72rI/s+olNzgN98WEDAcAj4TPT5opM0dvcnqMlf3uEGrEOKciO4tjSTmKfL9EJ8GZODsARKgKpw==", "dependencies": { - "Tekla.Structures": "2023.0.0", - "Tekla.Structures.Datatype": "2023.0.0", - "Tekla.Structures.Model": "2023.0.0" + "Tekla.Structures": "2023.0.1", + "Tekla.Structures.Datatype": "2023.0.1", + "Tekla.Structures.Model": "2023.0.1" } }, "Tekla.Structures.Datatype": { "type": "Transitive", - "resolved": "2023.0.0", - "contentHash": "5q/7OvUTFgJrXfkcUrrRzF5yJqxHuVyFZvf1M5smC/RgF5zFqJsfUXxxFlhk03pc0pu+f6cD/QjRTVopAMU9Aw==" - }, - "Tekla.Technology.Akit5": { - "type": "Transitive", - "resolved": "5.8.17235.1", - "contentHash": "MVvgt7lcJDYj9xqyZfVIfXXCUKodIL+F3y3Rvp7rc/46ukTzEtwuiW+IIlId1IQqtO3/WCZBPBQmBxfwhx9sFA==" - }, - "Tekla.Technology.Scripting": { - "type": "Transitive", - "resolved": "5.0.20041", - "contentHash": "PXD4j7++eEWxmL7K7JxqEcwLmIfjDgbM4DsA1m9iw9NcSWj3DAx4V/luWRfEcUTYvV0cRgD6/nGoiCQQTVbiZQ==" - }, - "Tekla.Technology.Scripting.Plugins": { - "type": "Transitive", - "resolved": "5.3.17206", - "contentHash": "GbdMWQjGufzB637bzfoQiP5N+MCbuTs5WqBEyOLvY7dA22zkKlwnwoPnW3Hy2hXPGhywNlcKmWCn4oKOcj22Uw==", - "dependencies": { - "Mono.Cecil": "0.9.6.1" - } + "resolved": "2023.0.1", + "contentHash": "24KbR++C2WYEIyDymIHX/AVuHYcgwyQrvgExMKDnMobQPNM+AmMNnwdyYxBbw4AvYXd8QHoi+lmmavhTCL8E3w==" }, "speckle.converters.common": { "type": "Project", @@ -393,26 +356,23 @@ "Tekla.Structures.Dialog": { "type": "CentralTransitive", "requested": "[2024.0.4, )", - "resolved": "2023.0.0", - "contentHash": "DPwrFnmhnaQJT0HmuormXow/b0jgyUSJ6llW1If8Vp8EQJlk/+VyelwqTFGCE3kNQrw0BPGvZ/fgUYaxjHcfdw==", + "resolved": "2023.0.1", + "contentHash": "gtU7dwMvnGe1+JnERp4ve6vHAIX55zNDg4VpoPKNMH75s8eV8qVPYD3ThFj9mhAylFPaQWVohXIqHXpNaDSJ5A==", "dependencies": { - "Tekla.Structures": "2023.0.0", - "Tekla.Structures.Catalogs": "2023.0.0", - "Tekla.Structures.Datatype": "2023.0.0", - "Tekla.Structures.Model": "2023.0.0", - "Tekla.Structures.Plugins": "2023.0.0" + "Tekla.Structures": "2023.0.1", + "Tekla.Structures.Catalogs": "2023.0.1", + "Tekla.Structures.Datatype": "2023.0.1", + "Tekla.Structures.Model": "2023.0.1", + "Tekla.Structures.Plugins": "2023.0.1" } }, "Tekla.Structures.Plugins": { "type": "CentralTransitive", "requested": "[2024.0.4, )", - "resolved": "2023.0.0", - "contentHash": "8mD7XoH03QnHTTkHHICjdXJk8MrvhMNt74LmwtiYgYm/bF7TErGIzDEyl/MFgBPjji9m2I+mUJmCUvOde+A6NQ==", + "resolved": "2023.0.1", + "contentHash": "Wap1V8Fri3VAirfX51tqaQk6yPqPGj9Y9Y2FGPdyXg+7wZy+S1H+3DxtzEmh7ZuCHqCv5gIP0r+1yLE9fcjHdw==", "dependencies": { - "Tekla.Structures": "2023.0.0", - "Tekla.Technology.Akit5": "5.8.17235.1", - "Tekla.Technology.Scripting": "5.0.20041", - "Tekla.Technology.Scripting.Plugins": "5.3.17206" + "Tekla.Structures": "2023.0.1" } } } diff --git a/Directory.Packages.props b/Directory.Packages.props index 528f69971..525208bbc 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -49,4 +49,4 @@ - \ No newline at end of file + diff --git a/Sdk/Speckle.Connectors.Logging/Consts.cs b/Sdk/Speckle.Connectors.Logging/Consts.cs index 53d9bda08..c8d5a24cc 100644 --- a/Sdk/Speckle.Connectors.Logging/Consts.cs +++ b/Sdk/Speckle.Connectors.Logging/Consts.cs @@ -32,6 +32,6 @@ public static string GetPackageVersion(Assembly assembly) } var indexOfPlusSign = informationalVersion.IndexOf('+'); - return indexOfPlusSign > 0 ? informationalVersion[..indexOfPlusSign] : informationalVersion; + return indexOfPlusSign > 0 ? informationalVersion.Substring(0, indexOfPlusSign) : informationalVersion; } } diff --git a/Sdk/Speckle.Connectors.Logging/Internal/MetricsBuilder.cs b/Sdk/Speckle.Connectors.Logging/Internal/MetricsBuilder.cs index 68cd531a8..d8f39e92b 100644 --- a/Sdk/Speckle.Connectors.Logging/Internal/MetricsBuilder.cs +++ b/Sdk/Speckle.Connectors.Logging/Internal/MetricsBuilder.cs @@ -16,7 +16,10 @@ public static IDisposable Initialize(SpeckleMetrics? metricsConfiguration, Resou if (metricsConfiguration?.Console ?? false) { - metricsProviderBuilder = metricsProviderBuilder.AddConsoleExporter(); + throw new NotImplementedException( + "Dependency on Console logging has been removed as it is not used, and causes a ILRepack warning" + ); + // metricsProviderBuilder = metricsProviderBuilder.AddConsoleExporter(); } metricsProviderBuilder = metricsProviderBuilder.AddHttpClientInstrumentation().SetResourceBuilder(resourceBuilder); diff --git a/Sdk/Speckle.Connectors.Logging/Internal/TracingBuilder.cs b/Sdk/Speckle.Connectors.Logging/Internal/TracingBuilder.cs index 42eeb2655..4600d1ed3 100644 --- a/Sdk/Speckle.Connectors.Logging/Internal/TracingBuilder.cs +++ b/Sdk/Speckle.Connectors.Logging/Internal/TracingBuilder.cs @@ -19,7 +19,10 @@ public static IDisposable Initialize(SpeckleTracing? logConfiguration, ResourceB if (logConfiguration?.Console ?? false) { - tracerProviderBuilder = tracerProviderBuilder.AddConsoleExporter(); + throw new NotImplementedException( + "Dependency on Console logging has been removed as it is not used, and causes a ILRepack warning" + ); + // tracerProviderBuilder = tracerProviderBuilder.AddConsoleExporter(); } tracerProviderBuilder = tracerProviderBuilder diff --git a/Sdk/Speckle.Connectors.Logging/Speckle.Connectors.Logging.csproj b/Sdk/Speckle.Connectors.Logging/Speckle.Connectors.Logging.csproj index e3100f21b..c197c7503 100644 --- a/Sdk/Speckle.Connectors.Logging/Speckle.Connectors.Logging.csproj +++ b/Sdk/Speckle.Connectors.Logging/Speckle.Connectors.Logging.csproj @@ -5,6 +5,7 @@ Debug;Release;Local + System.Range;System.Index Debug;Release;Local true @@ -14,7 +15,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/Sdk/Speckle.Connectors.Logging/packages.lock.json b/Sdk/Speckle.Connectors.Logging/packages.lock.json index 21def2c52..47e8e738b 100644 --- a/Sdk/Speckle.Connectors.Logging/packages.lock.json +++ b/Sdk/Speckle.Connectors.Logging/packages.lock.json @@ -39,17 +39,6 @@ "Microsoft.NETCore.Platforms": "1.1.0" } }, - "OpenTelemetry.Exporter.Console": { - "type": "Direct", - "requested": "[1.9.0, )", - "resolved": "1.9.0", - "contentHash": "TbScDLSc6kcji+/wZYIf8/HBV2SnttzN7PNxr3TYczlmGlU4K2ugujp6seSktEO4OaAvKRd7Y3CG3SKNj0C+1Q==", - "dependencies": { - "OpenTelemetry": "1.9.0", - "System.Text.Encodings.Web": "4.7.2", - "System.Text.Json": "4.7.2" - } - }, "OpenTelemetry.Exporter.OpenTelemetryProtocol": { "type": "Direct", "requested": "[1.9.0, )", @@ -350,8 +339,8 @@ }, "System.Numerics.Vectors": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + "resolved": "4.4.0", + "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" }, "System.Reflection.TypeExtensions": { "type": "Transitive", @@ -363,29 +352,6 @@ "resolved": "6.0.0", "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "iTUgB/WtrZ1sWZs84F2hwyQhiRH6QNjQv2DkwrH+WP6RoFga2Q1m3f9/Q7FG8cck8AdHitQkmkXSY8qylcDmuA==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "4.7.2", - "contentHash": "TcMd95wcrubm9nHvJEQs70rC0H/8omiSGGpU4FQ/ZA1URIqD4pjmFJh2Mfv1yH1eHgJDWTi2hMDXwTET+zOOyg==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "1.1.0", - "System.Buffers": "4.5.1", - "System.Memory": "4.5.4", - "System.Numerics.Vectors": "4.5.0", - "System.Runtime.CompilerServices.Unsafe": "4.7.1", - "System.Text.Encodings.Web": "4.7.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "System.Threading.Channels": { "type": "Transitive", "resolved": "8.0.0", diff --git a/global.json b/global.json index c19a2e057..4e550c173 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "8.0.400", "rollForward": "latestMinor" } }