huanld/speckle-sharp-connectors
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump SDK and enforce msbuild warnings (#379)

Browse Source 
* Bump SDK

* Updated Tekla structures nugets

* Tekla architecture targeting

* Fixed remaining warnings
This commit is contained in:
Jedd Morgan
2024-11-14 21:16:46 +00:00
committed by GitHub
parent b03e848669
commit f84c4b2d31
16 changed files with 99 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+2 -2
View File
@@ -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
.github/workflows/main.yml
+2 -2
View File
@@ -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
Build/Program.cs
+4 -1
View File
@@ -150,7 +150,10 @@ Target(
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"
);
}
);
Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Esri.ArcGISPro.Extensions30.Speckle.targets
+1 -3
View File
@@ -154,7 +154,6 @@
Log.LogErrorFromException(ex);
return false;
}
return Success;
]]>
</Code>
</Task>
@@ -190,7 +189,7 @@
{
Log.LogMessage(MessageImportance.Low, "RelativePaths: " + i.ToString());
}
return true;
Success = true;
]]>
</Code>
</Task>
@@ -266,7 +265,6 @@
CleanInfo = AssemblyName + extension;
}
Success = true;
return Success;
]]>
</Code>
</Task>
Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj
+5 -4
View File
@@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFramework>net48</TargetFramework>
<PlatformTarget>x64</PlatformTarget>
<TeklaVersion>2023</TeklaVersion>
<UseWpf>true</UseWpf>
<DefineConstants>$(DefineConstants);TEKLA2023</DefineConstants>
@@ -33,10 +34,10 @@
</Target>
<ItemGroup>
<PackageReference Include="Speckle.Objects" />
<PackageReference Include="Tekla.Structures.Dialog" IncludeAssets="compile; build" VersionOverride =" 2023.0.0" />
<PackageReference Include="Tekla.Structures.Drawing" IncludeAssets="compile; build" VersionOverride =" 2023.0.0"/>
<PackageReference Include="Tekla.Structures.Model" IncludeAssets="compile; build" VersionOverride =" 2023.0.0" />
<PackageReference Include="Tekla.Structures.Plugins" IncludeAssets="compile; build" VersionOverride =" 2023.0.0" />
<PackageReference Include="Tekla.Structures.Dialog" IncludeAssets="compile; build" VersionOverride =" 2023.0.1" />
<PackageReference Include="Tekla.Structures.Drawing" IncludeAssets="compile; build" VersionOverride =" 2023.0.1"/>
<PackageReference Include="Tekla.Structures.Model" IncludeAssets="compile; build" VersionOverride =" 2023.0.1" />
<PackageReference Include="Tekla.Structures.Plugins" IncludeAssets="compile; build" VersionOverride =" 2023.0.1" />
</ItemGroup>
<ItemGroup>
Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json
+36 -76
View File
@@ -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": {
Connectors/Tekla/Speckle.Connector.Tekla2024/Speckle.Connector.Tekla2024.csproj
+1
View File
@@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFramework>net48</TargetFramework>
<PlatformTarget>x64</PlatformTarget>
<TeklaVersion>2024</TeklaVersion>
<UseWpf>true</UseWpf>
<DefineConstants>$(DefineConstants);TEKLA2024</DefineConstants>
Converters/Tekla/Speckle.Converter.Tekla2023/Speckle.Converter.Tekla2023.csproj
+2 -2
View File
@@ -9,8 +9,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Tekla.Structures.Model" IncludeAssets="compile" VersionOverride =" 2023.0.0" />
<PackageReference Include="Tekla.Structures.Drawing" IncludeAssets="compile" VersionOverride =" 2023.0.0" />
<PackageReference Include="Tekla.Structures.Model" IncludeAssets="compile" VersionOverride =" 2023.0.1" />
<PackageReference Include="Tekla.Structures.Drawing" IncludeAssets="compile" VersionOverride =" 2023.0.1" />
</ItemGroup>
<ItemGroup>
Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json
+32 -72
View File
@@ -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"
}
}
}
Directory.Packages.props
+1 -1
View File
@@ -49,4 +49,4 @@
<GlobalPackageReference Include="Speckle.InterfaceGenerator" Version="0.9.6" />
<GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
</ItemGroup>
</Project>
</Project>
Sdk/Speckle.Connectors.Logging/Consts.cs
+1 -1
View File
@@ -32,6 +32,6 @@ public static class Consts
}
var indexOfPlusSign = informationalVersion.IndexOf('+');
return indexOfPlusSign > 0 ? informationalVersion[..indexOfPlusSign] : informationalVersion;
return indexOfPlusSign > 0 ? informationalVersion.Substring(0, indexOfPlusSign) : informationalVersion;
}
}
Sdk/Speckle.Connectors.Logging/Internal/MetricsBuilder.cs
+4 -1
View File
@@ -16,7 +16,10 @@ internal static class MetricsBuilder
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);
Sdk/Speckle.Connectors.Logging/Internal/TracingBuilder.cs
+4 -1
View File
@@ -19,7 +19,10 @@ internal static class TracingBuilder
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
Sdk/Speckle.Connectors.Logging/Speckle.Connectors.Logging.csproj
+1 -1
View File
@@ -5,6 +5,7 @@
<Configurations>Debug;Release;Local</Configurations>
</PropertyGroup>
<PropertyGroup>
<PolySharpExcludeGeneratedTypes>System.Range;System.Index</PolySharpExcludeGeneratedTypes>
<ILRepackTargetConfigurations>Debug;Release;Local</ILRepackTargetConfigurations>
<ILRepackRenameInternalized>true</ILRepackRenameInternalized>
</PropertyGroup>
@@ -14,7 +15,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" PrivateAssets="all"/>
<PackageReference Include="OpenTelemetry.Exporter.Console" PrivateAssets="all"/>
<PackageReference Include="OpenTelemetry.Instrumentation.Http" PrivateAssets="all"/>
<PackageReference Include="Serilog" PrivateAssets="all"/>
<PackageReference Include="Serilog.Exceptions" PrivateAssets="all"/>
Sdk/Speckle.Connectors.Logging/packages.lock.json
+2 -36
View File
@@ -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",
global.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"version": "8.0.400",
"rollForward": "latestMinor"
}
}