Skip to content

Commit 9fc7224

Browse files
authored
Fix build warnings (Azure#20921)
1 parent 6b3796b commit 9fc7224

File tree

5 files changed

+11
-24
lines changed

5 files changed

+11
-24
lines changed

sdk/batch/Microsoft.Azure.Batch/tests/IntegrationTests/Microsoft.Azure.Batch.Integration.Tests.csproj

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<AssemblyTitle>Microsoft Azure Batch Integration Tests</AssemblyTitle>
99
</PropertyGroup>
1010

11-
<PropertyGroup Condition=" '$(TargetFramework)'=='net452' ">
11+
<PropertyGroup Condition=" '$(IsTargetingNetFx)'=='true' ">
1212
<DefineConstants>FullNetFx</DefineConstants>
1313
<OutputPath>bin\$(Configuration)\</OutputPath>
1414
<DocumentationFile></DocumentationFile>
@@ -28,11 +28,6 @@
2828
</Content>
2929
</ItemGroup>
3030

31-
<!--<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
32-
<DefineConstants>netcoreapp11</DefineConstants>
33-
<OutputPath>bin\$(Configuration)\</OutputPath>
34-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
35-
</PropertyGroup>-->
3631
<ItemGroup>
3732
<PackageReference Include="Azure.Storage.Blobs" />
3833
<PackageReference Include="Microsoft.Azure.Management.Batch" />
@@ -58,13 +53,11 @@
5853
<ProjectReference Include="..\TestCommon\Microsoft.Azure.Batch.Common.csproj" />
5954
<ProjectReference Include="..\IntegrationTestCommon\Microsoft.Azure.Batch.IntegrationTestCommon.csproj" />
6055
</ItemGroup>
61-
62-
<ItemGroup>
56+
57+
<ItemGroup Condition=" '$(IsTargetingNetFx)'=='true' ">
6358
<Reference Include="System.Net" />
6459
<Reference Include="System.Net.Http" />
65-
<Reference Include="WindowsBase" />
66-
</ItemGroup>
67-
<ItemGroup Condition=" '$(IsTargetingNetFx)'=='true' ">
6860
<Reference Include="System.Windows.Forms" />
61+
<Reference Include="WindowsBase" />
6962
</ItemGroup>
7063
</Project>

sdk/batch/Microsoft.Azure.Batch/tests/UnitTests/Microsoft.Azure.Batch.Unit.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
</ItemGroup>
5050

5151
<ItemGroup>
52-
<Reference Include="System.Net" />
5352
<Reference Include="System.Net.Http" />
5453
</ItemGroup>
5554
</Project>

sdk/containerregistry/Azure.Containers.ContainerRegistry/tests/Azure.Containers.ContainerRegistry.Tests.csproj

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,7 @@
1717
<ProjectReference Include="..\src\Azure.Containers.ContainerRegistry.csproj" />
1818
</ItemGroup>
1919

20-
<!-- TODO: revert when Azure.Core ships -->
21-
<ItemGroup>
22-
<ProjectReference Include="..\..\..\core\Azure.Core\src\Azure.Core.csproj" />
23-
</ItemGroup>
24-
<!-- end TODO-->
25-
26-
<ItemGroup>
27-
<Reference Include="System.Web">
28-
<HintPath>..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7\System.Web.dll</HintPath>
29-
</Reference>
20+
<ItemGroup Condition="'$(IsTargetingNetFx)' == 'true'">
21+
<Reference Include="System.Web" />
3022
</ItemGroup>
3123
</Project>

sdk/search/Azure.Search.Documents/tests/Azure.Search.Documents.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<NoWarn>$(NoWarn);CS1591</NoWarn>
77
</PropertyGroup>
88

9-
<ItemGroup>
9+
<ItemGroup Condition="'$(IsTargetingNetFx)' == 'true'">
1010
<Reference Include="System.ComponentModel.DataAnnotations" />
1111
</ItemGroup>
1212

sdk/search/Microsoft.Azure.Search/tests/Microsoft.Azure.Search.Tests.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
<ExcludeFromTest>false</ExcludeFromTest>
1616
</PropertyGroup>
1717

18-
<ItemGroup>
18+
<ItemGroup Condition="'$(IsTargetingNetFx)' == 'true'">
1919
<Reference Include="System.ComponentModel.DataAnnotations" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
2023
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" />
2124
<ProjectReference Include="..\src\Microsoft.Azure.Search.csproj" />
2225
<ProjectReference Include="..\..\Microsoft.Azure.Management.Search\tests\Microsoft.Azure.Management.Search.Tests.csproj" />

0 commit comments

Comments
 (0)