Skip to content

Commit

Permalink
Merge branch 'dui3/alpha' into rhino-interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
adamhathcock committed Jun 20, 2024
2 parents a20127b + b58c348 commit 2d1629b
Show file tree
Hide file tree
Showing 26 changed files with 8,817 additions and 11 deletions.
15 changes: 12 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: windows-latest
outputs:
version: ${{ steps.set-version.outputs.version }}
steps:
Expand All @@ -25,11 +25,20 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.2xx # Align with global.json (including roll forward rules)

- name: Cache Nuget
uses: actions/cache@v4
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget-
- name: ⚒️ Run GitVersion
run: ./build.sh build-server-version
run: ./build.ps1 build-server-version

- name: ⚒️ Run build
run: ./build.sh
run: ./build.ps1

- name: ⬆️ Upload artifacts
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion Build/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ void RemoveDirectory(string d)
Consts.Solutions,
s =>
{
Run("dotnet", $"restore {s}");
Run("dotnet", $"restore {s} --locked-mode");
}
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,34 @@ private void GetIdsForStandaloneTablesAddedEvent(StandaloneTableEventArgs args)

private void GetIdsForMapMemberPropertiesChangedEvent(MapMemberPropertiesChangedEventArgs args)
{
foreach (MapMember member in args.MapMembers)
// don't subscribe to all events (e.g. expanding group, changing visibility etc.)
bool validEvent = false;
foreach (var hint in args.EventHints)
{
ChangedObjectIds.Add(member.URI);
if (
hint == MapMemberEventHint.DataSource
|| hint == MapMemberEventHint.DefinitionQuery
|| hint == MapMemberEventHint.LabelClasses
|| hint == MapMemberEventHint.LabelVisibility
|| hint == MapMemberEventHint.Name
|| hint == MapMemberEventHint.Renderer
|| hint == MapMemberEventHint.SceneLayerType
|| hint == MapMemberEventHint.URL
)
{
validEvent = true;
break;
}
}

if (validEvent)
{
foreach (MapMember member in args.MapMembers)
{
ChangedObjectIds.Add(member.URI);
}
RunExpirationChecks(false);
}
RunExpirationChecks(false);
}

public List<ISendFilter> GetSendFilters() => _sendFilters;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ CancellationToken cancellationToken
// add layer URI to bakedIds
bakedObjectIds.Add(trackerItem.MappedLayerURI == null ? "" : trackerItem.MappedLayerURI);

// mark dataset as already created
bakedMapMembers[trackerItem.DatasetId] = mapMember;

// add report item
AddResultsFromTracker(trackerItem, results);
}
Expand Down
Loading

0 comments on commit 2d1629b

Please sign in to comment.