Skip to content

Commit fbf6757

Browse files
KrzysztofCwalinaKrzysztofCwalina
authored
Updated dependencies to GA versions of the CDK (Azure#46868)
1 parent 597a9a7 commit fbf6757

File tree

8 files changed

+34
-52
lines changed

8 files changed

+34
-52
lines changed

‎eng/Packages.Data.props‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,14 @@
150150
<PackageReference Update="Azure.ResourceManager.Sql" Version="1.3.0-beta.8" />
151151
<PackageReference Update="Azure.ResourceManager.Storage" Version="1.2.3" />
152152

153+
<!-- CDK -->
154+
<PackageReference Update="Azure.Provisioning" Version="1.0.0" />
155+
<PackageReference Update="Azure.Provisioning.CognitiveServices" Version="1.0.0" />
156+
<PackageReference Update="Azure.Provisioning.EventGrid" Version="1.0.0" />
157+
<PackageReference Update="Azure.Provisioning.KeyVault" Version="1.0.0" />
158+
<PackageReference Update="Azure.Provisioning.ServiceBus" Version="1.0.0" />
159+
<PackageReference Update="Azure.Provisioning.Storage" Version="1.0.0" />
160+
153161
<!-- Other approved packages -->
154162
<PackageReference Update="Microsoft.Azure.Amqp" Version="2.6.7" />
155163
<PackageReference Update="Microsoft.Azure.WebPubSub.Common" Version="1.4.0" />

‎sdk/provisioning/Azure.Provisioning.CloudMachine/Azure.CloudMachine.sln‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Provisioning.CloudMac
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Provisioning.CloudMachine.Tests", "tests\Azure.Provisioning.CloudMachine.Tests.csproj", "{46DCEF27-4157-4FB6-A283-B8484EC45665}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Provisioning", "..\Azure.Provisioning\src\Azure.Provisioning.csproj", "{2F492C07-8182-41E2-8C68-27D353C9AB74}"
11-
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Provisioning.KeyVault", "..\Azure.Provisioning.KeyVault\src\Azure.Provisioning.KeyVault.csproj", "{DA43BF21-558B-438B-9DBF-1A88130C944A}"
13-
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Provisioning.ServiceBus", "..\Azure.Provisioning.ServiceBus\src\Azure.Provisioning.ServiceBus.csproj", "{48D33345-B5A8-4F94-84D6-A61F8E16271D}"
15-
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Provisioning.EventGrid", "..\Azure.Provisioning.EventGrid\src\Azure.Provisioning.EventGrid.csproj", "{BCBAF45F-E078-4230-9BDC-4DE9F2FBEE9A}"
17-
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Provisioning.CognitiveServices", "..\Azure.Provisioning.CognitiveServices\src\Azure.Provisioning.CognitiveServices.csproj", "{987279D2-202C-488A-BA47-37FCEEA51536}"
19-
EndProject
20-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Provisioning.Storage", "..\Azure.Provisioning.Storage\src\Azure.Provisioning.Storage.csproj", "{813E7228-2B59-41D2-9AFC-BF4092EC7090}"
21-
EndProject
2210
Global
2311
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2412
Debug|Any CPU = Debug|Any CPU
@@ -33,30 +21,6 @@ Global
3321
{46DCEF27-4157-4FB6-A283-B8484EC45665}.Debug|Any CPU.Build.0 = Debug|Any CPU
3422
{46DCEF27-4157-4FB6-A283-B8484EC45665}.Release|Any CPU.ActiveCfg = Release|Any CPU
3523
{46DCEF27-4157-4FB6-A283-B8484EC45665}.Release|Any CPU.Build.0 = Release|Any CPU
36-
{2F492C07-8182-41E2-8C68-27D353C9AB74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37-
{2F492C07-8182-41E2-8C68-27D353C9AB74}.Debug|Any CPU.Build.0 = Debug|Any CPU
38-
{2F492C07-8182-41E2-8C68-27D353C9AB74}.Release|Any CPU.ActiveCfg = Release|Any CPU
39-
{2F492C07-8182-41E2-8C68-27D353C9AB74}.Release|Any CPU.Build.0 = Release|Any CPU
40-
{DA43BF21-558B-438B-9DBF-1A88130C944A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41-
{DA43BF21-558B-438B-9DBF-1A88130C944A}.Debug|Any CPU.Build.0 = Debug|Any CPU
42-
{DA43BF21-558B-438B-9DBF-1A88130C944A}.Release|Any CPU.ActiveCfg = Release|Any CPU
43-
{DA43BF21-558B-438B-9DBF-1A88130C944A}.Release|Any CPU.Build.0 = Release|Any CPU
44-
{48D33345-B5A8-4F94-84D6-A61F8E16271D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45-
{48D33345-B5A8-4F94-84D6-A61F8E16271D}.Debug|Any CPU.Build.0 = Debug|Any CPU
46-
{48D33345-B5A8-4F94-84D6-A61F8E16271D}.Release|Any CPU.ActiveCfg = Release|Any CPU
47-
{48D33345-B5A8-4F94-84D6-A61F8E16271D}.Release|Any CPU.Build.0 = Release|Any CPU
48-
{BCBAF45F-E078-4230-9BDC-4DE9F2FBEE9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49-
{BCBAF45F-E078-4230-9BDC-4DE9F2FBEE9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
50-
{BCBAF45F-E078-4230-9BDC-4DE9F2FBEE9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
51-
{BCBAF45F-E078-4230-9BDC-4DE9F2FBEE9A}.Release|Any CPU.Build.0 = Release|Any CPU
52-
{987279D2-202C-488A-BA47-37FCEEA51536}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53-
{987279D2-202C-488A-BA47-37FCEEA51536}.Debug|Any CPU.Build.0 = Debug|Any CPU
54-
{987279D2-202C-488A-BA47-37FCEEA51536}.Release|Any CPU.ActiveCfg = Release|Any CPU
55-
{987279D2-202C-488A-BA47-37FCEEA51536}.Release|Any CPU.Build.0 = Release|Any CPU
56-
{813E7228-2B59-41D2-9AFC-BF4092EC7090}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57-
{813E7228-2B59-41D2-9AFC-BF4092EC7090}.Debug|Any CPU.Build.0 = Debug|Any CPU
58-
{813E7228-2B59-41D2-9AFC-BF4092EC7090}.Release|Any CPU.ActiveCfg = Release|Any CPU
59-
{813E7228-2B59-41D2-9AFC-BF4092EC7090}.Release|Any CPU.Build.0 = Release|Any CPU
6024
EndGlobalSection
6125
GlobalSection(SolutionProperties) = preSolution
6226
HideSolutionNode = FALSE

‎sdk/provisioning/Azure.Provisioning.CloudMachine/CHANGELOG.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
## 1.0.0-beta.1 (Unreleased)
44

5-
## 1.0.0-beta.2 (Unreleased)
6-
75
### Features Added
86

97
### Breaking Changes

‎sdk/provisioning/Azure.Provisioning.CloudMachine/api/Azure.Provisioning.CloudMachine.netstandard2.0.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ public readonly partial struct StorageServices
5151
private readonly int _dummyPrimitive;
5252
public void DeleteBlob(string path) { }
5353
public System.BinaryData DownloadBlob(string path) { throw null; }
54-
public string UploadBlob(object json, string? name = null) { throw null; }
54+
public string UploadBytes(System.BinaryData bytes, string? name = null) { throw null; }
55+
public string UploadBytes(byte[] bytes, string? name = null) { throw null; }
56+
public string UploadBytes(System.ReadOnlyMemory<byte> bytes, string? name = null) { throw null; }
57+
public string UploadJson(object json, string? name = null) { throw null; }
5558
public void WhenBlobUploaded(System.Action<Azure.CloudMachine.StorageFile> function) { }
5659
}
5760
}

‎sdk/provisioning/Azure.Provisioning.CloudMachine/src/Azure.Provisioning.CloudMachine.csproj‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Azure.Provisioning.CloudMachine simplifies declarative resource provisioning in .NET.</Description>
5-
<Version>1.0.0-beta.2</Version>
5+
<Version>1.0.0-beta.1</Version>
66
<TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
77
<LangVersion>12</LangVersion>
88

@@ -15,16 +15,14 @@
1515
<PackageReference Include="Azure.Identity" />
1616
<PackageReference Include="Azure.Messaging.ServiceBus" />
1717
<PackageReference Include="Azure.Messaging.EventGrid" />
18+
<PackageReference Include="Azure.Provisioning" />
19+
<PackageReference Include="Azure.Provisioning.KeyVault" />
20+
<PackageReference Include="Azure.Provisioning.Storage" />
21+
<PackageReference Include="Azure.Provisioning.CognitiveServices" />
22+
<PackageReference Include="Azure.Provisioning.ServiceBus" />
23+
<PackageReference Include="Azure.Provisioning.EventGrid" />
1824
<PackageReference Include="Azure.Security.KeyVault.Secrets" />
1925
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" VersionOverride="8.0.0" />
2026
</ItemGroup>
2127

22-
<ItemGroup>
23-
<ProjectReference Include="..\..\Azure.Provisioning.CognitiveServices\src\Azure.Provisioning.CognitiveServices.csproj" />
24-
<ProjectReference Include="..\..\Azure.Provisioning.EventGrid\src\Azure.Provisioning.EventGrid.csproj" />
25-
<ProjectReference Include="..\..\Azure.Provisioning.KeyVault\src\Azure.Provisioning.KeyVault.csproj" />
26-
<ProjectReference Include="..\..\Azure.Provisioning.ServiceBus\src\Azure.Provisioning.ServiceBus.csproj" />
27-
<ProjectReference Include="..\..\Azure.Provisioning.Storage\src\Azure.Provisioning.Storage.csproj" />
28-
</ItemGroup>
29-
3028
</Project>

‎sdk/provisioning/Azure.Provisioning.CloudMachine/src/AzureSdkExtensions/OpenAIFeature.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public override void AddTo(CloudMachineInfrastructure cloudMachine)
4949
Model = new CognitiveServicesAccountDeploymentModel() {
5050
Name = this.Model,
5151
Format = "OpenAI",
52-
Version = this.ModelVersion
52+
Version = this.ModelVersion,
5353
}
5454
},
5555
};

‎sdk/provisioning/Azure.Provisioning.CloudMachine/src/OFX/StorageServices.cs‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private BlobContainerClient GetContainer(string containerName)
4242
return container;
4343
}
4444

45-
public string UploadBlob(object json, string? name = default)
45+
public string UploadJson(object json, string? name = default)
4646
{
4747
BlobContainerClient container = GetDefaultContainer();
4848

@@ -53,6 +53,17 @@ public string UploadBlob(object json, string? name = default)
5353

5454
return name;
5555
}
56+
public string UploadBytes(BinaryData bytes, string? name = default)
57+
{
58+
BlobContainerClient container = GetDefaultContainer();
59+
if (name == default) name = $"b{Guid.NewGuid()}";
60+
container.UploadBlob(name, bytes);
61+
return name;
62+
}
63+
public string UploadBytes(byte[] bytes, string? name = default)
64+
=> UploadBytes(BinaryData.FromBytes(bytes), name);
65+
public string UploadBytes(ReadOnlyMemory<byte> bytes, string? name = default)
66+
=> UploadBytes(BinaryData.FromBytes(bytes), name);
5667

5768
public BinaryData DownloadBlob(string path)
5869
{

‎sdk/provisioning/Azure.Provisioning.CloudMachine/tests/CloudMachineTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void Storage(string[] args)
5353
Assert.AreEqual("{\"Foo\":5,\"Bar\":true}", data.ToString());
5454
eventSlim.Set();
5555
});
56-
var uploaded = cm.Storage.UploadBlob(new
56+
var uploaded = cm.Storage.UploadJson(new
5757
{
5858
Foo = 5,
5959
Bar = true
@@ -137,7 +137,7 @@ public void Demo(string[] args)
137137
CloudMachineClient cm = new();
138138

139139
// setup
140-
cm.Messaging.WhenMessageReceived((string message) => cm.Storage.UploadBlob(message));
140+
cm.Messaging.WhenMessageReceived((string message) => cm.Storage.UploadBytes(BinaryData.FromString(message)));
141141
cm.Storage.WhenBlobUploaded((StorageFile file) =>
142142
{
143143
var content = file.Download();

0 commit comments

Comments
 (0)