Skip to content

Commit dbf5d47

Browse files
authored
Aspire 9.3 upgrade (#693)
* Aspire 9.3 upgrade * Use IsHidden for snapshot instead of Hidden state
1 parent bea8907 commit dbf5d47

File tree

7 files changed

+8
-9
lines changed

7 files changed

+8
-9
lines changed

Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Nullable>enable</Nullable>
1313

1414
<AspireMajorVersion>9</AspireMajorVersion>
15-
<AspireVersion>$(AspireMajorVersion).2.0</AspireVersion>
15+
<AspireVersion>$(AspireMajorVersion).3.0</AspireVersion>
1616
<AspireAppHostSdkVersion>$(AspireVersion)</AspireAppHostSdkVersion>
1717
<AspNetCoreVersion>9.0.0</AspNetCoreVersion>
1818
<DotNetExtensionsVersion>9.0.4</DotNetExtensionsVersion>
@@ -37,8 +37,8 @@
3737

3838
<!-- Versioning -->
3939
<PropertyGroup>
40-
<ToolkitMinorVersion>4</ToolkitMinorVersion>
41-
<ToolkitPatchVersion>1</ToolkitPatchVersion>
40+
<ToolkitMinorVersion>5</ToolkitMinorVersion>
41+
<ToolkitPatchVersion>0</ToolkitPatchVersion>
4242
<ToolkitPreviewVersion>preview.1</ToolkitPreviewVersion>
4343

4444
<VersionPrefix>$(AspireMajorVersion).$(ToolkitMinorVersion).$(ToolkitPatchVersion)</VersionPrefix>

src/CommunityToolkit.Aspire.OllamaSharp/CommunityToolkit.Aspire.OllamaSharp.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<Description>A .NET Aspire client integration for the OllamaSharp library.</Description>
55
<AdditionalPackageTags>ollama ai ollamasharp client</AdditionalPackageTags>
6-
<IsPreview>true</IsPreview>
76
</PropertyGroup>
87

98
<ItemGroup>

src/Shared/Dapr/Core/IDistributedApplicationBuilderExtensions.shared.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static IResourceBuilder<IDaprComponentResource> AddDaprComponent(this IDi
3333
{
3434
Properties = [],
3535
ResourceType = "DaprComponent",
36-
State = KnownResourceStates.Hidden
36+
IsHidden = true,
3737
})
3838
.WithAnnotation(new ManifestPublishingCallbackAnnotation(context => WriteDaprComponentResourceToManifest(context, resource)));
3939
}

src/Shared/Dapr/Core/IDistributedApplicationComponentBuilderExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static IResourceBuilder<T> WithDaprSidecar<T>(this IResourceBuilder<T> bu
5959
{
6060
Properties = [],
6161
ResourceType = "DaprSidecar",
62-
State = KnownResourceStates.Hidden
62+
IsHidden = true,
6363
});
6464

6565
configureSidecar(sidecarBuilder);

tests/CommunityToolkit.Aspire.Hosting.Dapr.Tests/WithDaprSidecarTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void ResourceAddedWithHiddenInitialState()
3030
Assert.True(resource.TryGetAnnotationsOfType<ResourceSnapshotAnnotation>(out var annotations));
3131
var annotation = Assert.Single(annotations);
3232

33-
Assert.Equal(KnownResourceStates.Hidden, annotation.InitialSnapshot.State?.Text);
33+
Assert.True(annotation.InitialSnapshot.IsHidden);
3434
}
3535

3636
[Fact]

tests/dapr-shared/AddDaprPubSubTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void ResourceConfiguredWithHiddenIntialState()
5757
Assert.True(daprResource.TryGetAnnotationsOfType<ResourceSnapshotAnnotation>(out var annotations));
5858
var annotation = Assert.Single(annotations);
5959

60-
Assert.Equal(KnownResourceStates.Hidden, annotation.InitialSnapshot.State?.Text);
60+
Assert.True(annotation.InitialSnapshot.IsHidden);
6161
}
6262

6363
[Fact]

tests/dapr-shared/AddDaprStateStoreTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void ResourceConfiguredWithHiddenIntialState()
5757
Assert.True(daprResource.TryGetAnnotationsOfType<ResourceSnapshotAnnotation>(out var annotations));
5858
var annotation = Assert.Single(annotations);
5959

60-
Assert.Equal(KnownResourceStates.Hidden, annotation.InitialSnapshot.State?.Text);
60+
Assert.True(annotation.InitialSnapshot.IsHidden );
6161
}
6262

6363
[Fact]

0 commit comments

Comments
 (0)