Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev -> main #94

Merged
merged 90 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
2dcf89f
Merge pull request #21 from specklesystems/main
adamhathcock Jul 10, 2024
6778b70
All int tests on CI: Don't run non-int tests during int tests. Reduc…
adamhathcock Jul 10, 2024
5df0c44
Empty
adamhathcock Jul 10, 2024
6e46fd2
use more build fun for nugets (#22)
adamhathcock Jul 10, 2024
adadaa4
add dev to main build
adamhathcock Jul 10, 2024
c5df445
git version
adamhathcock Jul 10, 2024
ea68a24
Use a different minver id for now
adamhathcock Jul 10, 2024
cb14c43
Readded revit wall level setter (#23)
JR-Morgan Jul 10, 2024
51f0c26
Re added level public setter for Revit Column (#24)
JR-Morgan Jul 11, 2024
da79217
Added new Version Mutations (#25)
JR-Morgan Jul 11, 2024
db88dbe
Avoid wrapping cancellation exception (#26)
JR-Morgan Jul 11, 2024
b23e916
switch from minver to gitversion
adamhathcock Jul 12, 2024
e83c012
oops be linux
adamhathcock Jul 12, 2024
82d51af
fix checkout
adamhathcock Jul 12, 2024
3ec1007
format
adamhathcock Jul 12, 2024
1112ec3
clean up tests and altcover the integration tests
adamhathcock Jul 12, 2024
a88f860
Merge pull request #27 from specklesystems/git-version
adamhathcock Jul 15, 2024
5d4e14e
Add name property to definition proxy
oguzhankoral Jul 16, 2024
f0124a7
Merge pull request #28 from specklesystems/oguzhan/add-name-prop-to-d…
didimitrie Jul 16, 2024
cd67efd
Use the non-prerelease DoubleNumerics package (#29)
adamhathcock Jul 16, 2024
dc62aa2
Use GitVersion.MsBuild
adamhathcock Jul 16, 2024
e088e13
fix(core): Fixed regression with displayValue helper functions (#30)
JR-Morgan Jul 16, 2024
c35ce07
remove extra versioning stuff
adamhathcock Jul 16, 2024
057aef1
Merge pull request #31 from specklesystems/fixed-versions
adamhathcock Jul 16, 2024
baf5ab0
Fixed mistake (#32)
JR-Morgan Jul 16, 2024
fe27951
feat(dui3): adds layer concept in core as a poc
didimitrie Jul 16, 2024
e3a5af0
chore: formatting
didimitrie Jul 16, 2024
481a095
Merge pull request #34 from specklesystems/dim/dui3/layers
didimitrie Jul 16, 2024
72fe3d1
Update Layer.cs
clairekuang Jul 16, 2024
72b7123
Merge pull request #35 from specklesystems/claire/layer-constructor-fix
didimitrie Jul 16, 2024
4536ece
Remove the Point value prop getter
oguzhankoral Jul 17, 2024
e975975
Merge pull request #36 from specklesystems/oguzhan/fix-point-value-ge…
oguzhankoral Jul 17, 2024
b52d8e0
Remove value prop from Point object
oguzhankoral Jul 17, 2024
7f50e9a
Merge pull request #37 from specklesystems/oguzhan/remove-point-value…
didimitrie Jul 17, 2024
b70a0c6
Have it back
oguzhankoral Jul 17, 2024
f408980
Merge pull request #38 from specklesystems/oguzhan/remove-point-value…
didimitrie Jul 17, 2024
04446b9
changes namespace of collections and adds interfaces
clairekuang Jul 17, 2024
a2f0270
adds old collections namespace deprecation
clairekuang Jul 17, 2024
a15390a
Update Collection.cs
clairekuang Jul 17, 2024
a16bc4e
updates tests
clairekuang Jul 17, 2024
fcf4e22
version based on branch and more git locally
adamhathcock Jul 17, 2024
18ad5f5
do pack local
adamhathcock Jul 17, 2024
580521f
Add group proxy (#41)
oguzhankoral Jul 17, 2024
5f83798
Merge pull request #40 from specklesystems/claire/collections-refactor
clairekuang Jul 17, 2024
ee94ac2
Merge pull request #42 from specklesystems/fix-gitversion
adamhathcock Jul 17, 2024
64267d7
add local config
adamhathcock Jul 18, 2024
9e2f5d5
Merge pull request #43 from specklesystems/add-local
adamhathcock Jul 18, 2024
5891163
add xml docs and they get added to nugets (#45)
adamhathcock Jul 18, 2024
5c7a96b
ensure proper disposal of transports from di factory (#44)
adamhathcock Jul 18, 2024
957a284
Change DI sig for Server and adjust helpers (#46)
adamhathcock Jul 23, 2024
059253f
Revert SQLite to allow side by side (#48)
adamhathcock Jul 24, 2024
ce3e591
feat: CNX-19 adds render material proxy class (#50)
clairekuang Jul 24, 2024
02f75c7
Add NotNull Empty and tests (#51)
adamhathcock Jul 24, 2024
1f92335
retry policy for server api (#53)
JR-Morgan Jul 26, 2024
e79716c
Remove Sentry (#49)
adamhathcock Jul 29, 2024
787ad92
Remove extra usings (#55)
adamhathcock Jul 30, 2024
9671745
fixes null display value on curves decoded in breps
clairekuang Jul 31, 2024
69fceb4
Merge branch 'dev' into curve-encoding-bug
clairekuang Jul 31, 2024
fc46610
Update RevitInstance.cs
clairekuang Jul 31, 2024
adcf81b
Merge branch 'curve-encoding-bug' of https://github.com/specklesystem…
clairekuang Jul 31, 2024
a9a9b6b
Merge pull request #56 from specklesystems/curve-encoding-bug
clairekuang Jul 31, 2024
77ffcea
Speckle.Logging with ILRepack (#54)
adamhathcock Jul 31, 2024
9da1d79
Restructures proxies, removes layer colors, and adds color proxy clas…
clairekuang Aug 2, 2024
f8e4682
Reduce thread usage by removing a possible unneeded Task.Run (#52)
adamhathcock Aug 5, 2024
7148aa0
Refining OTEL/Logging configuration (#57)
adamhathcock Aug 6, 2024
6d54be5
Use App and Version when doing otel service name (#61)
adamhathcock Aug 7, 2024
0b240f0
Removed total children count (#63)
JR-Morgan Aug 8, 2024
6f5f044
Adam/cxpla 6 kill remaining kit code in core (#59)
adamhathcock Aug 8, 2024
78faa71
Collection name space change (#66)
JR-Morgan Aug 8, 2024
1c64a97
Add detail for OpenTelemetry (#67)
adamhathcock Aug 8, 2024
4b74ca8
Some tweaks r.e. JsonIgnore (#64)
JR-Morgan Aug 12, 2024
cfc4018
removed a bunch of obsolete (#65)
JR-Morgan Aug 12, 2024
66b3c5e
Added DUI3 Operations.Send changes to Sdk (#68)
JR-Morgan Aug 12, 2024
148a11f
Fixed source link (#70)
JR-Morgan Aug 13, 2024
d269ac7
Disallow SpeckleType inheritance (#71)
adamhathcock Aug 13, 2024
e443840
Do snupkgs are for Objects and Sdk...not logging (#72)
adamhathcock Aug 13, 2024
70729d5
feat(gis): CNX-285 new gis feature classes (#73)
clairekuang Aug 14, 2024
ea5ed87
Remove extra SaveObject (#75)
adamhathcock Aug 15, 2024
dc4da49
Add Progress for transfers (#74)
adamhathcock Aug 15, 2024
2fec0ea
Cleanup and use concurrent dictionary (#77)
adamhathcock Aug 15, 2024
b14c8db
Required keyword on various types (#76)
JR-Morgan Aug 16, 2024
42882cb
Perf changes (#79)
adamhathcock Aug 19, 2024
03a5706
add initial log statement and fix log path (#80)
adamhathcock Aug 19, 2024
af1d7df
Check for TypeLoader.initialize correctly (#85)
adamhathcock Aug 19, 2024
9bea79b
Removed incorrect platform targets (#84)
JR-Morgan Aug 19, 2024
9916048
Long Send Resiliency (#89)
JR-Morgan Aug 21, 2024
16b1b90
First pass for IBase (#81)
JR-Morgan Aug 21, 2024
0f116ad
Base caching on TypeLoader (#82)
adamhathcock Aug 22, 2024
4c3e572
clean up from progress (#78)
adamhathcock Aug 22, 2024
2b46792
Fixed issue with Km unit scalling (#93)
JR-Morgan Aug 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
"commands": [
"dotnet-csharpier"
]
},
"gitversion.tool": {
"version": "5.12.0",
"commands": [
"dotnet-gitversion"
]
}
}
}
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup .NET
uses: actions/setup-dotnet@v4
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: .NET Build and Publish

on:
push:
branches: ["main"]
branches: ["main", "dev"]

jobs:
build:
Expand All @@ -12,7 +12,6 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
filter: tree:0

- name: Setup .NET
uses: actions/setup-dotnet@v4
Expand All @@ -23,8 +22,6 @@ jobs:
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget-

- name: 🔫 Build and Pack
run: ./build.sh pack
Expand Down
25 changes: 20 additions & 5 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,35 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<IsPackable>false</IsPackable>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
</PropertyGroup>

<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>

<PropertyGroup>
<PropertyGroup>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<PackageTags>speckle</PackageTags>
<PackageProjectUrl>https://speckle.systems/</PackageProjectUrl>
<PackageIcon>logo.png</PackageIcon>
<RepositoryUrl>https://github.com/specklesystems/speckle-sharp-sdk</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<!-- Expose the repository root to all projects -->
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<MinVerDefaultPreReleaseIdentifiers>alpha</MinVerDefaultPreReleaseIdentifiers>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);1591;1573</NoWarn>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\README.md" Pack="true" PackagePath="\"/>
<None
Condition="'$(IsPackable)' == 'true'"
Include="..\..\logo.png"
Pack="true"
PackagePath="\"
Visible="false"/>
</ItemGroup>
</Project>
44 changes: 24 additions & 20 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,35 +1,39 @@
<Project>
<ItemGroup>
<PackageVersion Include="altcover" Version="8.8.74" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Bullseye" Version="5.0.0" />
<PackageVersion Include="GraphQL.Client" Version="6.0.0" />
<PackageVersion Include="Glob" Version="1.1.9" />
<PackageVersion Include="ILRepack.FullAuto" Version="1.6.0" />
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
<!-- Keep at 7 for side by side -->
<PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.7" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.19.2" />
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="NUnit" Version="4.1.0" />
<PackageVersion Include="NUnit.Analyzers" Version="4.2.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" version="1.9.0" />
<PackageVersion Include="Polly" Version="7.2.3" />
<PackageVersion Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
<PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" />
<PackageVersion Include="Sentry" Version="3.33.0" />
<PackageVersion Include="Sentry.Serilog" Version="3.33.0" />
<PackageVersion Include="Serilog" Version="2.12.0" />
<PackageVersion Include="Serilog.Enrichers.ClientInfo" Version="1.3.0" />
<PackageVersion Include="Serilog" Version="4.0.1" />
<PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageVersion Include="Serilog.Sinks.Seq" Version="5.2.2" />
<PackageVersion Include="SerilogTimings" Version="3.0.1" />
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
<PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="4.0.0" />
<PackageVersion Include="Shouldly" Version="4.2.1" />
<PackageVersion Include="Speckle.Newtonsoft.Json" Version="13.0.2" />
<PackageVersion Include="Speckle.DoubleNumerics" Version="4.0.1-alpha.3" />
<PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.6" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="NUnit" Version="4.1.0" />
<PackageVersion Include="NUnit.Analyzers" Version="4.2.0" />
<PackageVersion Include="Bullseye" Version="5.0.0" />
<PackageVersion Include="Glob" Version="1.1.9" />
<PackageVersion Include="Speckle.DoubleNumerics" Version="4.0.1" />
<PackageVersion Include="SimpleExec" Version="12.0.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.19.2" />
<!-- this was the previous version used -->
<PackageVersion Include="System.Text.Json" Version="5.0.2" />
<GlobalPackageReference Include="PolySharp" Version="1.14.1" />
<GlobalPackageReference Include="MinVer" Version="5.0.0" />
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<GlobalPackageReference Include="GitVersion.MsBuild" Version="5.12.0" />
<GlobalPackageReference Include="Speckle.InterfaceGenerator" Version="0.9.6" />
</ItemGroup>
</Project>
</Project>
11 changes: 11 additions & 0 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
next-version: 3.0.0
mode: ContinuousDeployment
assembly-informational-format: "{Major}.{Minor}.{Patch}-{PreReleaseTag}"
branches:
main:
regex: ^main$
tag: rc
develop:
tag: dev
pull-request:
tag: pr
38 changes: 20 additions & 18 deletions Speckle.Sdk.sln
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Core", "src\Speckle.Core\Speckle.Core.csproj", "{A413E196-3696-4F48-B635-04B5F76BF9C9}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Sdk", "src\Speckle.Sdk\Speckle.Sdk.csproj", "{A413E196-3696-4F48-B635-04B5F76BF9C9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Core.Tests.Unit", "tests\Speckle.Core.Tests.Unit\Speckle.Core.Tests.Unit.csproj", "{99AE2273-12C5-4A9D-9FDD-19F8B394B5E2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Transports.Disk", "src\Speckle.Transports.Disk\Speckle.Transports.Disk.csproj", "{6845F190-036C-4AEF-B267-23EE84DBD2A6}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Sdk.Tests.Unit", "tests\Speckle.Sdk.Tests.Unit\Speckle.Sdk.Tests.Unit.csproj", "{99AE2273-12C5-4A9D-9FDD-19F8B394B5E2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Objects", "src\Speckle.Objects\Speckle.Objects.csproj", "{181F50AA-DD2A-4541-98EF-B868E2D06B9A}"
EndProject
Expand All @@ -22,24 +20,28 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{DA2AED
Directory.Packages.props = Directory.Packages.props
global.json = global.json
README.md = README.md
GitVersion.yml = GitVersion.yml
docker-compose.yml = docker-compose.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{58D37DA9-F948-48CA-9A73-F5BBBD533DBF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "build", "build\build.csproj", "{9B8DDEB5-37C7-49B5-984D-C65DE5FCB7B7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Transports.MongoDB", "src\Speckle.Transports.MongoDB\Speckle.Transports.MongoDB.csproj", "{68078752-7C54-471A-9CB6-E8AEF34A9EFF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Core.Serialization.Tests", "tests\Speckle.Core.Serialization.Tests\Speckle.Core.Serialization.Tests.csproj", "{AA1E1E51-49AE-4F71-84B1-938E19695BE0}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Sdk.Serialization.Tests", "tests\Speckle.Sdk.Serialization.Tests\Speckle.Sdk.Serialization.Tests.csproj", "{AA1E1E51-49AE-4F71-84B1-938E19695BE0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Core.Tests.Integration", "tests\Speckle.Core.Tests.Integration\Speckle.Core.Tests.Integration.csproj", "{4FB41A6D-D139-4111-8115-E3F9F6BEAF24}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Sdk.Tests.Integration", "tests\Speckle.Sdk.Tests.Integration\Speckle.Sdk.Tests.Integration.csproj", "{4FB41A6D-D139-4111-8115-E3F9F6BEAF24}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{B623BD21-5CAA-43F9-A539-1835276C220E}"
ProjectSection(SolutionItems) = preProject
.github\workflows\main.yml = .github\workflows\main.yml
.github\workflows\ci.yml = .github\workflows\ci.yml
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Sdk.Logging", "src\Speckle.Sdk.Logging\Speckle.Sdk.Logging.csproj", "{156313B4-B588-4363-A0ED-5AB3A55AA4E8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.LongSendProblem", "tests\Speckle.LongSendProblem\Speckle.LongSendProblem.csproj", "{6B8D2DD8-AD20-4021-975C-6FDE71DC425B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -58,10 +60,6 @@ Global
{99AE2273-12C5-4A9D-9FDD-19F8B394B5E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{99AE2273-12C5-4A9D-9FDD-19F8B394B5E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{99AE2273-12C5-4A9D-9FDD-19F8B394B5E2}.Release|Any CPU.Build.0 = Release|Any CPU
{6845F190-036C-4AEF-B267-23EE84DBD2A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6845F190-036C-4AEF-B267-23EE84DBD2A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6845F190-036C-4AEF-B267-23EE84DBD2A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6845F190-036C-4AEF-B267-23EE84DBD2A6}.Release|Any CPU.Build.0 = Release|Any CPU
{181F50AA-DD2A-4541-98EF-B868E2D06B9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{181F50AA-DD2A-4541-98EF-B868E2D06B9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{181F50AA-DD2A-4541-98EF-B868E2D06B9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -74,10 +72,6 @@ Global
{9B8DDEB5-37C7-49B5-984D-C65DE5FCB7B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9B8DDEB5-37C7-49B5-984D-C65DE5FCB7B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9B8DDEB5-37C7-49B5-984D-C65DE5FCB7B7}.Release|Any CPU.Build.0 = Release|Any CPU
{68078752-7C54-471A-9CB6-E8AEF34A9EFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{68078752-7C54-471A-9CB6-E8AEF34A9EFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{68078752-7C54-471A-9CB6-E8AEF34A9EFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{68078752-7C54-471A-9CB6-E8AEF34A9EFF}.Release|Any CPU.Build.0 = Release|Any CPU
{AA1E1E51-49AE-4F71-84B1-938E19695BE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AA1E1E51-49AE-4F71-84B1-938E19695BE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA1E1E51-49AE-4F71-84B1-938E19695BE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -86,17 +80,25 @@ Global
{4FB41A6D-D139-4111-8115-E3F9F6BEAF24}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FB41A6D-D139-4111-8115-E3F9F6BEAF24}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4FB41A6D-D139-4111-8115-E3F9F6BEAF24}.Release|Any CPU.Build.0 = Release|Any CPU
{156313B4-B588-4363-A0ED-5AB3A55AA4E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{156313B4-B588-4363-A0ED-5AB3A55AA4E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{156313B4-B588-4363-A0ED-5AB3A55AA4E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{156313B4-B588-4363-A0ED-5AB3A55AA4E8}.Release|Any CPU.Build.0 = Release|Any CPU
{6B8D2DD8-AD20-4021-975C-6FDE71DC425B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6B8D2DD8-AD20-4021-975C-6FDE71DC425B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6B8D2DD8-AD20-4021-975C-6FDE71DC425B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6B8D2DD8-AD20-4021-975C-6FDE71DC425B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{A413E196-3696-4F48-B635-04B5F76BF9C9} = {5CB96C27-FC5B-4A41-86B6-951AF99B8116}
{6845F190-036C-4AEF-B267-23EE84DBD2A6} = {5CB96C27-FC5B-4A41-86B6-951AF99B8116}
{181F50AA-DD2A-4541-98EF-B868E2D06B9A} = {5CB96C27-FC5B-4A41-86B6-951AF99B8116}
{99AE2273-12C5-4A9D-9FDD-19F8B394B5E2} = {35047EE7-AD1D-4741-80A7-8F0E874718E9}
{A0338FC0-3011-498F-AD09-01230FABD3ED} = {35047EE7-AD1D-4741-80A7-8F0E874718E9}
{9B8DDEB5-37C7-49B5-984D-C65DE5FCB7B7} = {58D37DA9-F948-48CA-9A73-F5BBBD533DBF}
{68078752-7C54-471A-9CB6-E8AEF34A9EFF} = {5CB96C27-FC5B-4A41-86B6-951AF99B8116}
{AA1E1E51-49AE-4F71-84B1-938E19695BE0} = {35047EE7-AD1D-4741-80A7-8F0E874718E9}
{4FB41A6D-D139-4111-8115-E3F9F6BEAF24} = {35047EE7-AD1D-4741-80A7-8F0E874718E9}
{B623BD21-5CAA-43F9-A539-1835276C220E} = {DA2AED52-58F9-471E-8AD8-102FD36129E3}
{156313B4-B588-4363-A0ED-5AB3A55AA4E8} = {5CB96C27-FC5B-4A41-86B6-951AF99B8116}
{6B8D2DD8-AD20-4021-975C-6FDE71DC425B} = {35047EE7-AD1D-4741-80A7-8F0E874718E9}
EndGlobalSection
EndGlobal
54 changes: 49 additions & 5 deletions build/Program.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using GlobExpressions;
using GlobExpressions;
using static Bullseye.Targets;
using static SimpleExec.Command;

Expand All @@ -9,7 +9,24 @@
const string RESTORE = "restore";
const string BUILD = "build";
const string TEST = "test";
const string INTEGRATION = "integration";
const string PACK = "pack";
const string PACK_LOCAL = "pack-local";
const string CLEAN_LOCKS = "clean-locks";

Target(
CLEAN_LOCKS,
() =>
{
foreach (var f in Glob.Files(".", "**/*.lock.json"))
{
Console.WriteLine("Found and will delete: " + f);
File.Delete(f);
}
Console.WriteLine("Running restore now.");
Run("dotnet", "restore .\\Speckle.Sdk.sln");
}
);

Target(
CLEAN,
Expand Down Expand Up @@ -43,7 +60,14 @@ void RemoveDirectory(string d)

Target(RESTORE, () => RunAsync("dotnet", "restore Speckle.Sdk.sln --locked-mode"));

Target(BUILD, DependsOn(RESTORE), () => RunAsync("dotnet", "build Speckle.Sdk.sln -c Release --no-restore"));
Target(
BUILD,
DependsOn(RESTORE),
async () =>
{
await RunAsync("dotnet", $"build Speckle.Sdk.sln -c Release --no-restore");
}
);

Target(
TEST,
Expand All @@ -53,13 +77,33 @@ void RemoveDirectory(string d)
{
await RunAsync(
"dotnet",
$"test {file} -c Release --no-build --no-restore --verbosity=normal /p:AltCover=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage"
$"test {file} -c Release --no-build --no-restore --verbosity=normal /p:AltCover=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage /p:AltCoverVerbosity=Warning"
);
}
);

Target(PACK, DependsOn(TEST), () => RunAsync("dotnet", "pack Speckle.Sdk.sln -c Release -o output --no-build"));
Target(
INTEGRATION,
DependsOn(BUILD),
async () =>
{
await RunAsync("docker", "compose -f docker-compose.yml up --wait");
foreach (var test in Glob.Files(".", "**/*.Tests.Integration.csproj"))
{
await RunAsync(
"dotnet",
$"test {test} -c Release --no-build --no-restore --verbosity=normal /p:AltCover=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage"
);
}
await RunAsync("docker", "compose down");
}
);

static Task RunRestore() => RunAsync("dotnet", "pack Speckle.Sdk.sln -c Release -o output --no-build");

Target(PACK, DependsOn(TEST), RunRestore);
Target(PACK_LOCAL, DependsOn(BUILD), RunRestore);

Target("default", DependsOn(FORMAT, TEST), () => Console.WriteLine("Done!"));
Target("default", DependsOn(FORMAT, TEST, INTEGRATION), () => Console.WriteLine("Done!"));

await RunTargetsAndExitAsync(args).ConfigureAwait(true);
18 changes: 12 additions & 6 deletions build/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
"resolved": "5.0.0",
"contentHash": "bqyt+m17ym+5aN45C5oZRAjuLDt8jKiCm/ys1XfymIXSkrTFwvI/QsbY3ucPSHDz7SF7uON7B57kXFv5H2k1ew=="
},
"GitVersion.MsBuild": {
"type": "Direct",
"requested": "[5.12.0, )",
"resolved": "5.12.0",
"contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
},
"Glob": {
"type": "Direct",
"requested": "[1.1.9, )",
Expand All @@ -24,12 +30,6 @@
"Microsoft.SourceLink.Common": "8.0.0"
}
},
"MinVer": {
"type": "Direct",
"requested": "[5.0.0, )",
"resolved": "5.0.0",
"contentHash": "ybkgpQMtt0Fo91l5rYtE3TZtD+Nmy5Ko091xvfXXOosQdMi30XO2EZ2+ShZt89gdu7RMmJqZaJ+e1q6d+6+KNw=="
},
"PolySharp": {
"type": "Direct",
"requested": "[1.14.1, )",
Expand All @@ -42,6 +42,12 @@
"resolved": "12.0.0",
"contentHash": "ptxlWtxC8vM6Y6e3h9ZTxBBkOWnWrm/Sa1HT+2i1xcXY3Hx2hmKDZP5RShPf8Xr9D+ivlrXNy57ktzyH8kyt+Q=="
},
"Speckle.InterfaceGenerator": {
"type": "Direct",
"requested": "[0.9.6, )",
"resolved": "0.9.6",
"contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
},
"Microsoft.Build.Tasks.Git": {
"type": "Transitive",
"resolved": "8.0.0",
Expand Down
Loading
Loading