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.

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

Directory restructure for CR and test projects #3129

Merged
merged 6 commits into from
Apr 26, 2017
Merged
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
2 changes: 2 additions & 0 deletions AzSdk.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
-->
</Project>
13 changes: 7 additions & 6 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
<NuGetKey Condition=" '$(NuGetKey)' == '' ">1234</NuGetKey>
<NugetPackageName/>
<ImportDirectoryBuildTargets>true</ImportDirectoryBuildTargets>
<DefaultPathTokenToIgnore>$(IgnorePathTokens) Microsoft.Azure.KeyVault.Samples Gallery Intune Batch\dataPlane Search</DefaultPathTokenToIgnore>
<!--Microsoft.Azure.KeyVault.Samples ClientIntegrationTesting FileConventions FileStaging
ClientRuntime.Azure.TestFramework
Condition=" '$(IgnorePathTokens)' == '' "
ClientRuntime.Azure.TestFramework Microsoft.Azure.Test.HttpRecorder
-->
</PropertyGroup>
<PropertyGroup>
<CIToolsPath>$(OnPremiseBuildTasks)</CIToolsPath>
Expand All @@ -42,12 +48,7 @@
<ClientRuntimeRootDir>$(LibraryRoot)src\UpgradeVS17\SdkCommon\ClientRuntime</ClientRuntimeRootDir>
<SdkCommonRootDir>$(LibraryRoot)src\UpgradeVS17\SdkCommon\ClientRuntime</SdkCommonRootDir>
</PropertyGroup>

<Target Name="PublishLocal">
<Exec Command="$(NuGetCommand) push &quot;$(PackageOutputDir)\%(SdkNuGetPackage.Identity).%(SdkNuGetPackage.PackageVersion).nupkg&quot; $(NuGetKey)$(ActualSource)"
IgnoreExitCode="true"
Condition=" '%(SdkNuGetPackage.Publish)' != 'false' " />
</Target>

<Import Project="tools\buildTargets\common.Build.props"/>
<Import Project="tools\buildTargets\common.NugetPackage.props" />
</Project>
2 changes: 1 addition & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="tools\buildTargets\common.targets" />
<Import Project="tools\buildTargets\common.targets" />
</Project>
1 change: 1 addition & 0 deletions build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<Import Project="test.props" />
<Import Project="AzSdk.props" />
<Import Project="Directory.Build.targets" />

<Target Name="Clean" DependsOnTargets="$(CleanTraversedProjectsDependsOn)" />
<Target Name="Restore" DependsOnTargets="$(RestoreTraversedProjectsDependsOn)" />
<Target Name="Build" DependsOnTargets="$(BuildTraversedProjectsDependsOn)" />
Expand Down
4 changes: 2 additions & 2 deletions src/SDKs/Cdn/Cdn.Tests/Cdn.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.Azure.ResourceManager" Version="1.1.0-preview" />

<!--<ProjectReference Include="..\Management.Cdn\Microsoft.Azure.Management.Cdn.csproj" />-->
<PackageReference Include="Microsoft.Azure.Management.Cdn" Version="3.0.1-preview" />
<ProjectReference Include="..\Management.Cdn\Microsoft.Azure.Management.Cdn.csproj" />
<!--<PackageReference Include="Microsoft.Azure.Management.Cdn" Version="3.0.1-preview" />-->
</ItemGroup>

<ItemGroup>
Expand Down
57 changes: 2 additions & 55 deletions src/SDKs/Cdn/Management.Cdn/Microsoft.Azure.Management.Cdn.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,10 @@
<PropertyGroup>
<Description>Microsoft Azure CDN Management Library</Description>
<VersionPrefix>3.1.0-preview</VersionPrefix>
<AssemblyName>Microsoft.Azure.Management.Cdn</AssemblyName>
<!--
<Authors>Microsoft</Authors>
<TargetFrameworks>net45;netstandard1.5;netstandard1.1</TargetFrameworks>
<DelaySign>true</DelaySign>
<AssemblyName>Microsoft.Azure.Management.Cdn</AssemblyName>
<AssemblyOriginatorKeyFile>../../../../tools/MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
-->
<AssemblyName>Microsoft.Azure.Management.Cdn</AssemblyName>
<PackageId>Microsoft.Azure.Management.Cdn</PackageId>
<PackageTags>Microsoft Azure CDN management;CDN;Cdn management;REST HTTP client;windowsazureofficial;netcore451511</PackageTags>
<PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
<PackageProjectUrl>https://github.com/Azure/azure-sdk-for-net</PackageProjectUrl>
<PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE</PackageLicenseUrl>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.1</NetStandardImplicitPackageVersion>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.1' ">1.6.1</NetStandardImplicitPackageVersion>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateNeutralResourcesLanguageAttribute>false</GenerateNeutralResourcesLanguageAttribute>

</PropertyGroup>

<PropertyGroup>
Expand All @@ -49,33 +25,4 @@
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
<PackageReference Include="System.Threading.Tasks" Version="4.3.0" />
</ItemGroup>

<!--
<ItemGroup>
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.5,4.0.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.5,3.0.0)" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
<PackageReference Include="System.Diagnostics.Tools" Version="4.3.0" />
<PackageReference Include="System.Net.Http" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
<PackageReference Include="System.Threading.Tasks" Version="4.3.0" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<DefineConstants>$(DefineConstants);PORTABLE</DefineConstants>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
</ItemGroup>
-->
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<Import Project="$([MSBuild]::GetPathOfFileAbove('clientruntime.reference.props'))" />
<PropertyGroup>
<PackageId>Microsoft.Rest.ClientRuntime.Azure.Authentication</PackageId>
<Description>Provides ADAL based authentication for Azure management client libraries</Description>
<AssemblyName>Microsoft.Rest.ClientRuntime.Azure.Authentication</AssemblyName>
<AssemblyTitle>Authentication for Azure Management Clients</AssemblyTitle>
<VersionPrefix>2.2.13</VersionPrefix>
<PackageTags>Microsoft AutoRest ClientRuntime Authentication $(NugetCommonTags) $(NugetCommonProfileTags)</PackageTags>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="[2.28.3]" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="[3.13.5]" />
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="[5.1.2]" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.6,3.0.0)" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@
<NoWarn>1701;1702;1705</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.6,3.0)" />
<!--<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.6,3.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.5,4.0.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="[2.2.12,3.0.0)" />
<!--
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.6,3.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.5,4.0.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="[2.2.12,3.0.0)" />
-->
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="[2.2.12,3.0.0)" />-->

<ProjectReference Include="..\ClientRuntime.Azure\Microsoft.Rest.ClientRuntime.Azure.csproj" />
<ProjectReference Include="..\..\ClientRuntime\ClientRuntime\Microsoft.Rest.ClientRuntime.csproj" />
<ProjectReference Include="..\..\ClientRuntime.Azure.Authentication\Microsoft.Rest.ClientRuntime.Azure.Authentication.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Resources;
using Xunit;

/*
[assembly: AssemblyTitle("Microsoft Rest Azure Client Runtime Tests")]
[assembly: AssemblyDescription("Tests for the Azure Client Runtime.")]
[assembly: AssemblyVersion("1.0.0.0")]
Expand All @@ -17,5 +16,4 @@
[assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("en")]
*/
[assembly: NeutralResourcesLanguage("en")]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetPathOfFileAbove('clientruntime.reference.props'))" />
<PropertyGroup>
<PackageId>Microsoft.Rest.ClientRuntime.Azure</PackageId>
<Description>Provides common error handling, tracing, and HTTP/REST-based pipeline manipulation.</Description>
<AssemblyTitle>Client Runtime for Microsoft Azure Libraries</AssemblyTitle>
<VersionPrefix>3.3.6</VersionPrefix>
<AssemblyName>Microsoft.Rest.ClientRuntime.Azure</AssemblyName>
<PackageTags>Microsoft Azure AutoRest ClientRuntime REST $(NugetCommonTags) $(NugetCommonProfileTags)</PackageTags>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.6,3.0.0)" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetPathOfFileAbove('clientruntime.reference.props'))" />
<PropertyGroup>
<Description>Enables tracing of event messages for AutoRest generated client libraries events via ETW (Event Tracing for Windows). ETW events can be captured by subscribing to the "Microsoft.Rest" event source.</Description>
<AssemblyTitle>ETW Logger for Microsoft AutoRest Generated Clients</AssemblyTitle>
<VersionPrefix>2.1.2</VersionPrefix>
<AssemblyName>Microsoft.Rest.ClientRuntime.Etw</AssemblyName>
<PackageId>Microsoft.Rest.ClientRuntime.Etw</PackageId>
<PackageTags>Microsoft AutoRest ClientRuntime REST ETW $(NugetCommonTags) $(NugetCommonProfileTags)</PackageTags>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net452</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>bin\Debug\net452\Microsoft.Rest.ClientRuntime.Etw.xml</DocumentationFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.6" />
</ItemGroup>
</Project>
26 changes: 26 additions & 0 deletions src/SdkCommon/ClientRuntime.Etw/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.

using System;
using System.Reflection;
using System.Resources;
using System.Runtime.InteropServices;


[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.2.11.0")]

//[assembly: AssemblyTitle("Microsoft Rest Client Runtime ETW Logger")]
//[assembly: AssemblyDescription("Provides ETW tracing of \"Microsoft.Rest\" Client Library events.")]
//[assembly: AssemblyVersion("2.0.0.0")]
//[assembly: AssemblyFileVersion("2.1.2.0")]

//[assembly: AssemblyConfiguration("")]
//[assembly: AssemblyCompany("Microsoft Corporation")]
//[assembly: AssemblyProduct("Microsoft AutoRest")]
//[assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation")]
//[assembly: AssemblyTrademark("")]
//[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("en")]
[assembly: CLSCompliant(true)]
[assembly: ComVisible(false)]
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetPathOfFileAbove('clientruntime.reference.props'))" />
<PropertyGroup>
<PackageId>Microsoft.Rest.ClientRuntime.Log4Net</PackageId>
<Description>Enables logging of event messages for AutoRest generated client libraries via Log4Net.</Description>
<AssemblyTitle>Log4Net Logger for Microsoft AutoRest Generated Clients</AssemblyTitle>
<VersionPrefix>2.1.3</VersionPrefix>
<AssemblyName>Microsoft.Rest.ClientRuntime.Log4Net</AssemblyName>
<PackageTags>Rest ClientRuntime Azure Test Log4Net $(NugetCommonTags) $(NugetCommonProfileTags)</PackageTags>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net452</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="log4net" Version="2.0.3" />
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.6" />
</ItemGroup>
</Project>
Loading