Skip to content

Commit bfd4f83

Browse files
author
Filiz Topatan
committed
update Blueprint SDK with new version
1 parent 86fb7b4 commit bfd4f83

File tree

6 files changed

+13
-53
lines changed

6 files changed

+13
-53
lines changed

src/Blueprint/Blueprint.Test/Blueprint.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<None Remove="UnitTests\**" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.Azure.Management.Blueprint" Version="0.12.0-preview" />
18+
<PackageReference Include="Microsoft.Azure.Management.Blueprint" Version="0.13.0-preview" />
1919
</ItemGroup>
2020
<ItemGroup>
2121
<ProjectReference Include="..\Blueprint\Blueprint.csproj" />

src/Blueprint/Blueprint/Blueprint.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Import Project="$(MSBuildThisFileDirectory)..\..\Az.props" />
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Azure.Management.Blueprint" Version="0.12.0-preview" />
11+
<PackageReference Include="Microsoft.Azure.Management.Blueprint" Version="0.13.0-preview" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

src/Blueprint/Blueprint/Blueprint.format.ps1xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
</ListItem>
5757
<ListItem>
5858
<Label>TimeCreated</Label>
59-
<ScriptBlock>$_.Status.TimeCreated.ToString("yyyy-MM-dd")</ScriptBlock>
59+
<ScriptBlock>$_.Status.TimeCreated.ToString()</ScriptBlock>
6060
</ListItem>
6161
<ListItem>
6262
<Label>TargetScope</Label>
@@ -127,7 +127,7 @@
127127
</ListItem>
128128
<ListItem>
129129
<Label>TimeCreated</Label>
130-
<ScriptBlock>$_.Status.TimeCreated.ToString("yyyy-MM-dd")</ScriptBlock>
130+
<ScriptBlock>$_.Status.TimeCreated.ToString()</ScriptBlock>
131131
</ListItem>
132132
<ListItem>
133133
<Label>TargetScope</Label>

src/Blueprint/Blueprint/Models/PSBlueprint.cs

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,10 @@ internal static PSBlueprint FromBlueprintModel(BlueprintModel model, string scop
5555
psBlueprint.Versions = versionsDict.Keys.ToArray();
5656
}
5757

58-
if (DateTime.TryParse(model.Status.TimeCreated, out DateTime timeCreated))
59-
{
60-
psBlueprint.Status.TimeCreated = timeCreated;
61-
}
62-
else
63-
{
64-
psBlueprint.Status.TimeCreated = null;
65-
}
58+
psBlueprint.Status.TimeCreated = model.Status.TimeCreated;
59+
60+
psBlueprint.Status.LastModified = model.Status.LastModified;
6661

67-
if (DateTime.TryParse(model.Status.LastModified, out DateTime lastModified))
68-
{
69-
psBlueprint.Status.LastModified = lastModified;
70-
}
71-
else
72-
{
73-
psBlueprint.Status.LastModified = null;
74-
}
7562

7663
if (Enum.TryParse(model.TargetScope, true, out PSBlueprintTargetScope targetScope))
7764
{

src/Blueprint/Blueprint/Models/PSBlueprintAssignment.cs

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,9 @@ internal static PSBlueprintAssignment FromAssignment(Assignment assignment, stri
6464
ResourceGroups = new Dictionary<string, PSResourceGroupValue>()
6565
};
6666

67-
if (DateTime.TryParse(assignment.Status.TimeCreated, out DateTime timeCreated))
68-
{
69-
psAssignment.Status.TimeCreated = timeCreated;
70-
}
71-
else
72-
{
73-
psAssignment.Status.TimeCreated = null;
74-
}
67+
psAssignment.Status.TimeCreated = assignment.Status.TimeCreated;
7568

76-
if (DateTime.TryParse(assignment.Status.LastModified, out DateTime lastModified))
77-
{
78-
psAssignment.Status.LastModified = lastModified;
79-
}
80-
else
81-
{
82-
psAssignment.Status.LastModified = null;
83-
}
69+
psAssignment.Status.LastModified = assignment.Status.LastModified;
8470

8571
if (Enum.TryParse(assignment.ProvisioningState, true, out PSAssignmentProvisioningState state))
8672
{

src/Blueprint/Blueprint/Models/PSPublishedBlueprint.cs

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,11 @@ internal static PSPublishedBlueprint FromPublishedBlueprintModel(PublishedBluepr
4747
Version = model.Name, // Name is the version in PublishedBlueprint object.
4848
ChangeNotes = model.ChangeNotes
4949
};
50-
51-
if (DateTime.TryParse(model.Status.TimeCreated, out DateTime timeCreated))
52-
{
53-
psBlueprint.Status.TimeCreated = timeCreated;
54-
}
55-
else
56-
{
57-
psBlueprint.Status.TimeCreated = null;
58-
}
5950

60-
if (DateTime.TryParse(model.Status.LastModified, out DateTime lastModified))
61-
{
62-
psBlueprint.Status.LastModified = lastModified;
63-
}
64-
else
65-
{
66-
psBlueprint.Status.LastModified = null;
67-
}
51+
psBlueprint.Status.TimeCreated = model.Status.TimeCreated;
52+
53+
psBlueprint.Status.LastModified = model.Status.LastModified;
54+
6855

6956
if (Enum.TryParse(model.TargetScope, true, out PSBlueprintTargetScope targetScope))
7057
{

0 commit comments

Comments
 (0)