Skip to content

Aspire 9.3 upgrade #693

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 20, 2025
Merged

Aspire 9.3 upgrade #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be090f3
Aspire 9.3 upgrade
Alirexaa May 19, 2025
ac1bb53
Use IsHidden for snapshot instead of Hidden state
Alirexaa May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<Nullable>enable</Nullable>

<AspireMajorVersion>9</AspireMajorVersion>
<AspireVersion>$(AspireMajorVersion).2.0</AspireVersion>
<AspireVersion>$(AspireMajorVersion).3.0</AspireVersion>
<AspireAppHostSdkVersion>$(AspireVersion)</AspireAppHostSdkVersion>
<AspNetCoreVersion>9.0.0</AspNetCoreVersion>
<DotNetExtensionsVersion>9.0.4</DotNetExtensionsVersion>
Expand All @@ -37,8 +37,8 @@

<!-- Versioning -->
<PropertyGroup>
<ToolkitMinorVersion>4</ToolkitMinorVersion>
<ToolkitPatchVersion>1</ToolkitPatchVersion>
<ToolkitMinorVersion>5</ToolkitMinorVersion>
<ToolkitPatchVersion>0</ToolkitPatchVersion>
<ToolkitPreviewVersion>preview.1</ToolkitPreviewVersion>

<VersionPrefix>$(AspireMajorVersion).$(ToolkitMinorVersion).$(ToolkitPatchVersion)</VersionPrefix>
Expand Down
1 change: 0 additions & 1 deletion src/CommunityToolkit.Aspire.OllamaSharp/CommunityToolkit.Aspire.OllamaSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<PropertyGroup>
<Description>A .NET Aspire client integration for the OllamaSharp library.</Description>
<AdditionalPackageTags>ollama ai ollamasharp client</AdditionalPackageTags>
<IsPreview>true</IsPreview>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/Dapr/Core/IDistributedApplicationBuilderExtensions.shared.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static IResourceBuilder<IDaprComponentResource> AddDaprComponent(this IDi
{
Properties = [],
ResourceType = "DaprComponent",
State = KnownResourceStates.Hidden
IsHidden = true,
})
.WithAnnotation(new ManifestPublishingCallbackAnnotation(context => WriteDaprComponentResourceToManifest(context, resource)));
}
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/Dapr/Core/IDistributedApplicationComponentBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static IResourceBuilder<T> WithDaprSidecar<T>(this IResourceBuilder<T> bu
{
Properties = [],
ResourceType = "DaprSidecar",
State = KnownResourceStates.Hidden
IsHidden = true,
});

configureSidecar(sidecarBuilder);
Expand Down
2 changes: 1 addition & 1 deletion tests/CommunityToolkit.Aspire.Hosting.Dapr.Tests/WithDaprSidecarTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void ResourceAddedWithHiddenInitialState()
Assert.True(resource.TryGetAnnotationsOfType<ResourceSnapshotAnnotation>(out var annotations));
var annotation = Assert.Single(annotations);

Assert.Equal(KnownResourceStates.Hidden, annotation.InitialSnapshot.State?.Text);
Assert.True(annotation.InitialSnapshot.IsHidden);
}

[Fact]
Expand Down
2 changes: 1 addition & 1 deletion tests/dapr-shared/AddDaprPubSubTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void ResourceConfiguredWithHiddenIntialState()
Assert.True(daprResource.TryGetAnnotationsOfType<ResourceSnapshotAnnotation>(out var annotations));
var annotation = Assert.Single(annotations);

Assert.Equal(KnownResourceStates.Hidden, annotation.InitialSnapshot.State?.Text);
Assert.True(annotation.InitialSnapshot.IsHidden);
}

[Fact]
Expand Down
2 changes: 1 addition & 1 deletion tests/dapr-shared/AddDaprStateStoreTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void ResourceConfiguredWithHiddenIntialState()
Assert.True(daprResource.TryGetAnnotationsOfType<ResourceSnapshotAnnotation>(out var annotations));
var annotation = Assert.Single(annotations);

Assert.Equal(KnownResourceStates.Hidden, annotation.InitialSnapshot.State?.Text);
Assert.True(annotation.InitialSnapshot.IsHidden );
}

[Fact]
Expand Down
Loading