Skip to content

Update Track 2 Mgmt Plane Template #21876

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
m-nash merged 6 commits into from
Jun 16, 2021
Merged

Update Track 2 Mgmt Plane Template #21876

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c8fc2c2
Update Track 2 Mgmt Plane Template
allenjzhang Jun 15, 2021
bde5b67
Moving the package ref into the actual project file
allenjzhang Jun 15, 2021
eada161
Merge remote-tracking branch 'upstream/feature/mgmt-track2' into azha…
allenjzhang Jun 15, 2021
b1aca7b
Fixing Management tests and updating sln to include missed project
allenjzhang Jun 16, 2021
e65c129
Update build for core.test and invert the mgmt shared test code include.
allenjzhang Jun 16, 2021
a1e61ac
Fix CI
allenjzhang Jun 16, 2021
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
1 change: 1 addition & 0 deletions eng/Directory.Build.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
<ItemGroup Condition="'$(IsMgmtLibrary)' == 'true'">
Comment thread
allenjzhang marked this conversation as resolved.
<PackageReference Include="Azure.Core" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="Azure.ResourceManager.Core" Condition="'$(SkipArmCorePackageReference)' == ''"/>
</ItemGroup>

<PropertyGroup>
Expand Down
5 changes: 5 additions & 0 deletions eng/Packages.Data.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@
<PackageReference Update="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>

<!-- Packages intended for Management libraries only -->
<ItemGroup Condition="'$(IsMgmtLibrary)' == 'true'">
<PackageReference Update="Azure.ResourceManager.Core" Version="1.0.0-alpha.20210526.3" />
</ItemGroup>

<!-- Packages intended for Extensions libraries only -->
<ItemGroup Condition="'$(IsExtensionClientLibrary)' == 'true'">
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="2.1.0" />
Expand Down
5 changes: 1 addition & 4 deletions ...emplates/Azure.ResourceManager.Template/tests/Azure.ResourceManager.Template.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TestHelperProjects>;</TestHelperProjects>
<UseNewMgmtFramework>true</UseNewMgmtFramework>
Comment thread
allenjzhang marked this conversation as resolved.
Outdated
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(AzureCoreTestFramework)" />
<ProjectReference Include="..\src\Azure.ResourceManager.Template.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Azure.ResourceManager.Resources"/>
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions sdk/resourcemanager/Azure.ResourceManager.Core/src/Azure.ResourceManager.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<PackageTags>azure;management;resource</PackageTags>
<NoWarn>$(NoWarn);AZC0008;AZC0107;CA2214;CA1036;CA1067;CA1065;SA1028</NoWarn>
<IncludeGeneratorSharedCode>true</IncludeGeneratorSharedCode>
<SkipArmCorePackageReference>true</SkipArmCorePackageReference>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions sdk/resourcemanager/Azure.ResourceManager.Core/tests/Azure.ResourceManager.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<DefineConstants>$(DefineConstants);RESOURCES_RP</DefineConstants>
<TestHelperProjects>;</TestHelperProjects>
<UseNewMgmtFramework>true</UseNewMgmtFramework>
<SkipArmCorePackageReference>true</SkipArmCorePackageReference>
</PropertyGroup>
<PropertyGroup>
<NoWarn>SA1649;SA1633;SA1000;SA1028;SA1400;SA1508</NoWarn>
Expand Down