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

Enabling Project references in test projects #3099

Merged
merged 3 commits into from
Apr 19, 2017
Merged

Enabling Project references in test projects #3099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ae335d
Testing few projects with proj references
Apr 18, 2017
cb98936
Fixing project references
Apr 19, 2017
f5b54e1
disabling Datalake store test that randomly fails on CI machine
Apr 19, 2017
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
10 changes: 8 additions & 2 deletions AzSdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- <Import Project="tools\buildTargets\common.Build.props"/> -->
<!-- <Import Project="tools\buildTargets\common.NugetPackage.props" /> -->
<PropertyGroup Label="DebugBuildOptions" Condition=" '$(Configuration)|$(Platform)'=='Debug|AnyCPU' ">
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Label="ReleaseBuildOptions" Condition=" '$(Configuration)|$(Platform)'=='Release|AnyCPU' ">
<DelaySign>false</DelaySign>
</PropertyGroup>
</Project>
10 changes: 2 additions & 8 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="dirs.proj" />


<Import Project="dirs.proj" />
<PropertyGroup>
<LibraryRoot>$(MSBuildThisFileDirectory)</LibraryRoot>
<LibrarySourceFolder>$(LibraryRoot)src</LibrarySourceFolder>
Expand All @@ -21,7 +19,6 @@
<ImportDirectoryBuildTargets>true</ImportDirectoryBuildTargets>
</PropertyGroup>
<PropertyGroup>
<!--OnPremiseBuildTasks is not a good name, but CI server is using that, will update across soon-->
<CIToolsPath>$(OnPremiseBuildTasks)</CIToolsPath>
<OnPremiseBuild Condition=" Exists($(OnPremiseBuildTasks)) ">true</OnPremiseBuild>
<OnPremiseBuild Condition=" ! Exists($(OnPremiseBuildTasks)) ">false</OnPremiseBuild>
Expand Down Expand Up @@ -50,10 +47,7 @@
<Exec Command="$(NuGetCommand) push &quot;$(PackageOutputDir)\%(SdkNuGetPackage.Identity).%(SdkNuGetPackage.PackageVersion).nupkg&quot; $(NuGetKey)$(ActualSource)"
IgnoreExitCode="true"
Condition=" '%(SdkNuGetPackage.Publish)' != 'false' " />

</Target>


</Target>
<Import Project="tools\buildTargets\common.Build.props"/>
<Import Project="tools\buildTargets\common.NugetPackage.props" />
</Project>
1 change: 0 additions & 1 deletion NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
<packageSources>
<!-- To enable LocalFeed for testing uncomment the following line -->
<add key="Local" value="tools\LocalNugetFeed" />
<add key="KVLocal" value="src\SDKs\KeyVault\KVLocalFeed" />
</packageSources>
</configuration>
13 changes: 7 additions & 6 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
<Import Project="Directory.Build.props" />
<Import Project="Directory.Build.targets" />
<Import Project="test.props" />
<Import Project="AzSdk.props" />
<Target Name="Clean" DependsOnTargets="$(CleanTraversedProjectsDependsOn)" />
<Target Name="Restore" DependsOnTargets="$(RestoreTraversedProjectsDependsOn)" />
<Target Name="Build" DependsOnTargets="Restore;$(BuildTraversedProjectsDependsOn)" />
<Import Project="AzSdk.props" />

<Target Name="Clean" DependsOnTargets="$(CleanTraversedProjectsDependsOn)" />
<Target Name="Restore" DependsOnTargets="$(RestoreTraversedProjectsDependsOn)" />
<Target Name="Build" DependsOnTargets="$(BuildTraversedProjectsDependsOn)" />
<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
<Target Name="FullBuild" DependsOnTargets="ReBuild;Test" />
<Target Name="FullBuild" DependsOnTargets="Build;RunTests;Package;Publish" />
<Target Name="RunTests" DependsOnTargets="$(RunTestProjectsDependsOn)" />
</Project>
4 changes: 2 additions & 2 deletions src/SDKs/AnalysisServices/AnalysisServices.Tests/AnalysisServices.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</PropertyGroup>

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

<ItemGroup>
Expand Down
30 changes: 4 additions & 26 deletions src/SDKs/AzSdk.test.reference.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,13 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetPathOfFileAbove('test.props'))" />
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.7.0,2.0.0)" />
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.7.0,2.0.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.6.0,2.0.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.5,4.0.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.6,3.0)" />
<PackageReference Include="Microsoft.Azure.ResourceManager" Version="1.1.0-preview" />
<PackageReference Include="Microsoft.Azure.ResourceManager" Version="1.1.0-preview" />

<!-- This is needed for discovering tests in test explorer -->
<PackageReference Include="System.Runtime.InteropServices" Version="4.1.0" />

</ItemGroup>



<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<!--
<Reference Include="System.Net" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.WebRequest" />
-->
</ItemGroup>

<!--


<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">

<PackageReference Include="Microsoft.NETCore.Platforms" Version="1.1.0" />
<PackageReference Include="NETStandard.Library" Version="1.6.1" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<!-- This is needed for discovering tests in test explorer -->
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
</ItemGroup>
-->
</Project>
65 changes: 7 additions & 58 deletions src/SDKs/Billing/Billing.Tests/Billing.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.test.reference.props'))" />

<Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.test.reference.props'))" />
<PropertyGroup>
<PackageId>Billing.Tests</PackageId>
<Description>Billing.Tests Class Library</Description>
<Authors>Microsoft Corporation</Authors>
<!--<TargetFramework>netcoreapp1.0</TargetFramework>
<DelaySign>true</DelaySign>
<AssemblyName>Billing.Tests</AssemblyName>
<AssemblyOriginatorKeyFile>../../../../tools/MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>-->
<PackageId>Billing.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<PackageProjectUrl>https://github.com/Azure/azure-sdk-for-net</PackageProjectUrl>
<PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE</PackageLicenseUrl>
<!--<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>-->
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<VersionPrefix>1.0.0-preview</VersionPrefix>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -31,51 +14,17 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.ResourceManager" Version="1.1.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Billing" Version="1.1.0-preview" />
<!--<PackageReference Include="Microsoft.Azure.Management.Billing" Version="1.1.0-preview" />-->
<ProjectReference Include="..\Management.Billing\Microsoft.Azure.Management.Billing.csproj" />
</ItemGroup>

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>

<ItemGroup>
<None Update="SessionRecords\Billing.Tests.ScenarioTests.InvoicesTests\GetInvoicesNoResult.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Billing.Tests.ScenarioTests.InvoicesTests\GetInvoiceWithName.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Billing.Tests.ScenarioTests.InvoicesTests\GetLatestInvoice.json">
<None Update="SessionRecords\**\*.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Billing.Tests.ScenarioTests.InvoicesTests\ListInvoicesTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Billing.Tests.ScenarioTests.InvoicesTests\ListInvoicesWithQueryParametersTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Billing.Tests.ScenarioTests.OperationsTests\ListOperationsTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<!--

<ItemGroup>
<Compile Include="..\..\..\..\tools\DisableTestRunParallel.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.Azure.Management.Billing\Microsoft.Azure.Management.Billing.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.6.7-preview,2.0.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.5.1-preview,2.0.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.4,4.0.0)" />
<PackageReference Include="Microsoft.Azure.ResourceManager" Version="1.0.0-preview" />
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
</None>
</ItemGroup>
-->
</Project>
112 changes: 5 additions & 107 deletions src/SDKs/Cdn/Cdn.Tests/Cdn.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.test.reference.props'))" />
<PropertyGroup>
<PackageId>Cdn.Tests</PackageId>
<Description>Cdn.Tests Class Library</Description>
<VersionPrefix>1.0.2</VersionPrefix>
<Authors>Microsoft Corporation</Authors>
<!--<TargetFramework>netcoreapp1.0</TargetFramework>
<DelaySign>true</DelaySign>
<AssemblyName>Cdn.Tests</AssemblyName>
<AssemblyOriginatorKeyFile>../../../../tools/MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>-->
<PackageId>Cdn.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<PackageProjectUrl>https://github.com/Azure/azure-sdk-for-net</PackageProjectUrl>
<PackageLicenseUrl>https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE</PackageLicenseUrl>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<VersionPrefix>1.0.2</VersionPrefix>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>netcoreapp1.1</TargetFrameworks>
Expand All @@ -31,101 +13,17 @@
<ItemGroup>
<PackageReference Include="Microsoft.Azure.ResourceManager" Version="1.1.0-preview" />

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

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>

<ItemGroup>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.CustomDomainTests\CustomDomainCRUDTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.EndpointTests\EndpointCheckUsageTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.EndpointTests\EndpointCreateTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.EndpointTests\EndpointDeleteTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.EndpointTests\EndpointGetListTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.EndpointTests\EndpointPurgeLoadTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.EndpointTests\EndpointStartStopTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.EndpointTests\EndpointUpdateTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.EndpointTests\ValidateCustomDomainTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.GetEdgeNodeTests\GetEdgeNodeTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.NameAvailabilityTests\EndpointCheckNameAvailabilityTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.OperationsTests\ListOperationsTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.OriginTests\OriginCreateTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.OriginTests\OriginDeleteTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.OriginTests\OriginGetListTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.OriginTests\OriginUpdateTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.ProfileTests\GenerateSsoUriTest.json">
<None Update="SessionRecords\**\*.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.ProfileTests\ProfileCheckUsageTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.ProfileTests\ProfileCreateTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.ProfileTests\ProfileDeleteTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.ProfileTests\ProfileGetListTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.ProfileTests\ProfileListBySubcriptionTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="SessionRecords\Cdn.Tests.ScenarioTests.ProfileTests\ProfileUpdateTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<!--
<ItemGroup>
<Compile Include="..\..\..\..\tools\DisableTestRunParallel.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="1.5.0-preview" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.3,4.0.0)" />
<PackageReference Include="Microsoft.Azure.ResourceManager" Version="1.0.0-preview" />
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.Azure.Management.Cdn\Microsoft.Azure.Management.Cdn.csproj" />
</ItemGroup>
-->
</Project>
Loading