Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@
<PackageReference Update="Humanizer.Core" Version="2.14.1" />
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectName.StartsWith('Generator'))">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please explain this entry. The condition is overly generalized and I'd like to understand the scenario where this reference is needed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is targeting just the Generator package under Azure.Provisioning, which seems to just be named Generator.

I'm happy to try to target it even more granularly, but I would appreciate some help in how to do that, as I'm new to .NET/C#.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Resource Manager libraries are generally approved for current generation libraries, as they're known safe and under our control. I'd suggest just adding this in this section unconditionally, in alphabetical order by package name.

<PackageReference Update="Azure.ResourceManager.CognitiveServices" Version="1.5.2" />
</ItemGroup>

<!--
Dependency versions for Track 2, Microsoft.* libraries.
These are dependencies for Track 2 integration packages
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public AIModelsFeature(string model, string modelVersion)
/// <param name="infrastructure"></param>
protected override void EmitConstructs(ProjectInfrastructure infrastructure)
{
CognitiveServicesAccount cognitiveServices = new("aiservices")
CognitiveServicesAccount cognitiveServices = new("aiservices", resourceVersion: "2024-10-01")
{
Name = infrastructure.ProjectId,
Kind = "AIServices",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public OpenAIAccountFeature(CognitiveServicesSku? sku = default)
/// <param name="infrastructure"></param>
protected override void EmitConstructs(ProjectInfrastructure infrastructure)
{
CognitiveServicesAccount cognitiveServices = new("openai")
CognitiveServicesAccount cognitiveServices = new("openai", resourceVersion: "2024-10-01")
{
Name = infrastructure.ProjectId,
Kind = "OpenAI",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert. There's no reason this file should be in this PR.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests were failing without this for me

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The line exists already, and this looks like a noop change. Was there a non-printable in there? Can you share the error message?

// Licensed under the MIT License.

using System;
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading