Skip to content
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

Jump to bottom

make track2 mgmt sdks preview 1 depends on Azure.Core 2.2 #12910

Merged
merged 4 commits into from
Jun 22, 2020
Merged

make track2 mgmt sdks preview 1 depends on Azure.Core 2.2 #12910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8cefda
make track2 mgmt sdks preview 1 depends on Azure.Core 2.2
erich-wang Jun 22, 2020
37ed4fd
fix project reference check error
erich-wang Jun 22, 2020
8384ef6
remove duplicate import for storage
erich-wang Jun 22, 2020
eceb6b0
fix core ci error for test common projects
erich-wang Jun 22, 2020
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
3 changes: 1 addition & 2 deletions eng/Directory.Build.Data.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@
<!-- *********** Management Client Library Override section ************* -->
<ItemGroup Condition="'$(IsMgmtClientLibrary)' == 'true' and '$(IsTestProject)' != 'true'">
<PackageReference Include="System.Text.Json" />
<ProjectReference Include="$(RepoRoot)\sdk\core\Azure.Core\src\Azure.Core.csproj" />


<!-- TODO: Review these file references-->
<Compile Include="$(AzureCoreSharedSources)ArrayBufferWriter.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
<Compile Include="$(AzureCoreSharedSources)ClientDiagnostics.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
Expand Down
1 change: 1 addition & 0 deletions sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
-->
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
<Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
Copy link
Member

Choose a reason for hiding this comment

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

Why add this to all the individual libraries as opposed to shared targets file?

cc @allenjzhang

</Project>
1 change: 1 addition & 0 deletions sdk/compute/Azure.ResourceManager.Compute/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
-->
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
<Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
</Project>
1 change: 1 addition & 0 deletions sdk/eventhub/Azure.ResourceManager.EventHubs/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
-->
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
<Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
</Project>
1 change: 1 addition & 0 deletions sdk/keyvault/Azure.ResourceManager.KeyVault/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
-->
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
<Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
</Project>
1 change: 1 addition & 0 deletions sdk/network/Azure.ResourceManager.Network/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
-->
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
<Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
</Project>
1 change: 1 addition & 0 deletions sdk/resources/Azure.ResourceManager.Resources/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
-->
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
<Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
</Project>
1 change: 0 additions & 1 deletion sdk/storage/Azure.ResourceManager.Storage/tests/Azure.ResourceManager.Storage.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<TestHelperProjects>Resources201705;</TestHelperProjects>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\core\Azure.Core\src\Azure.Core.csproj" />
<ProjectReference Include="..\src\Azure.ResourceManager.Storage.csproj" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions sdk/testcommon/Azure.Graph.Rbac/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
-->
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
<Import Condition="'$(IsClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
</Project>
1 change: 1 addition & 0 deletions sdk/testcommon/Azure.Management.Compute.2019_12/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
-->
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
<Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
</Project>
1 change: 1 addition & 0 deletions sdk/testcommon/Azure.Management.Network.2020_04/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
-->
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
<Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
</Project>
1 change: 1 addition & 0 deletions sdk/testcommon/Azure.Management.Resources.2017_05/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
-->
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
<Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
</Project>
1 change: 1 addition & 0 deletions sdk/testcommon/Azure.Management.Storage.2019_06/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
Add any shared properties you want for the projects under this package directory that need to be set before the auto imported Directory.Build.props
-->
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
<Import Condition="'$(IsMgmtClientLibrary)' == 'true'" Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" />
</Project>