Skip to content

Commit 35b8487

Browse files
MiYanniMiYanni
authored
Merge pull request #29 from Azure/net452-targets-file
Net452 targets file
2 parents 9174c9a + 05566e0 commit 35b8487

File tree

85 files changed

+322
-1549
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+322
-1549
lines changed

‎src/Aks/Aks.Netcore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
3131
<SignAssembly>true</SignAssembly>
3232
<DelaySign>true</DelaySign>
33-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
33+
<AssemblyOriginatorKeyFile>..\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
3434
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
3535
</PropertyGroup>
3636

‎src/Aks/Aks.csproj‎

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
3+
<Import Project="$(ProjectDir)..\Dependencies.targets" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -34,31 +34,13 @@
3434
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
3535
<ErrorReport>prompt</ErrorReport>
3636
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
37-
<CodeAnalysisRuleSetDirectories>;$(MSBuildProgramFiles32)\Microsoft Visual Studio\2017\Enterprise\Team Tools\Static Analysis Tools\Rule Sets\</CodeAnalysisRuleSetDirectories>
37+
<CodeAnalysisRuleSetDirectories>;$(MSBuildProgramFiles32)\Microsoft Visual Studio\2017\Enterprise\Team Tools\Static Analysis Tools\Rule Sets\;$(MSBuildProgramFiles32)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\</CodeAnalysisRuleSetDirectories>
3838
<SignAssembly>true</SignAssembly>
39-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
39+
<AssemblyOriginatorKeyFile>..\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
4040
<DelaySign>true</DelaySign>
4141
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
4242
<Prefer32Bit>false</Prefer32Bit>
4343
</PropertyGroup>
44-
<ItemGroup>
45-
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.12\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
47-
<Private>True</Private>
48-
</Reference>
49-
<Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.13\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
51-
<Private>True</Private>
52-
</Reference>
53-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
54-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
55-
<Private>True</Private>
56-
</Reference>
57-
<Reference Include="System" />
58-
<Reference Include="System.Core" />
59-
<Reference Include="System.Net" />
60-
<Reference Include="System.Net.Http" />
61-
</ItemGroup>
6244
<ItemGroup>
6345
<Compile Include="Properties\AssemblyInfo.cs" />
6446
<Compile Include="Version2017_08_31\ContainerServiceClient.cs" />
@@ -86,18 +68,6 @@
8668
<Compile Include="Version2017_08_31\Models\OSType.cs" />
8769
<Compile Include="Version2017_08_31\Models\Page.cs" />
8870
<Compile Include="Version2017_08_31\Models\Resource.cs" />
89-
<None Include="MSSharedLibKey.snk" />
9071
</ItemGroup>
9172
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
92-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
93-
Other similar extension points exist, see Microsoft.Common.targets.
94-
<Target Name="BeforeBuild">
95-
</Target>
96-
<Target Name="AfterBuild">
97-
</Target>
98-
-->
99-
<ItemGroup>
100-
<None Include="packages.config" />
101-
</ItemGroup>
102-
<ItemGroup />
10373
</Project>

‎src/Aks/packages.config‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/Authentication.Abstractions/Authentication.Abstractions.Netcore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
3131
<SignAssembly>true</SignAssembly>
3232
<DelaySign>true</DelaySign>
33-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
33+
<AssemblyOriginatorKeyFile>..\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
3434
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
3535
</PropertyGroup>
3636

‎src/Authentication.Abstractions/Authentication.Abstractions.csproj‎

Lines changed: 3 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
3+
<Import Project="$(ProjectDir)..\Dependencies.targets" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -40,60 +40,13 @@
4040
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
4141
<ErrorReport>prompt</ErrorReport>
4242
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
43-
<CodeAnalysisRuleSetDirectories>;$(MSBuildProgramFiles32)\Microsoft Visual Studio\2017\Enterprise\Team Tools\Static Analysis Tools\Rule Sets\</CodeAnalysisRuleSetDirectories>
43+
<CodeAnalysisRuleSetDirectories>;$(MSBuildProgramFiles32)\Microsoft Visual Studio\2017\Enterprise\Team Tools\Static Analysis Tools\Rule Sets\;$(MSBuildProgramFiles32)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\</CodeAnalysisRuleSetDirectories>
4444
<SignAssembly>true</SignAssembly>
45-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
45+
<AssemblyOriginatorKeyFile>..\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
4646
<DelaySign>true</DelaySign>
4747
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
4848
<Prefer32Bit>false</Prefer32Bit>
4949
</PropertyGroup>
50-
<ItemGroup>
51-
<Reference Include="Hyak.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<HintPath>..\..\packages\Hyak.Common.1.0.3\lib\net45\Hyak.Common.dll</HintPath>
53-
<Private>True</Private>
54-
</Reference>
55-
<Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
57-
<Private>True</Private>
58-
</Reference>
59-
<Reference Include="Microsoft.Azure.Common.NetFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
61-
<Private>True</Private>
62-
</Reference>
63-
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.12\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
65-
<Private>True</Private>
66-
</Reference>
67-
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
68-
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
69-
<Private>True</Private>
70-
</Reference>
71-
<Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
72-
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
73-
<Private>True</Private>
74-
</Reference>
75-
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
76-
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
77-
<Private>True</Private>
78-
</Reference>
79-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
80-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
81-
<Private>True</Private>
82-
</Reference>
83-
<Reference Include="System" />
84-
<Reference Include="System.Core" />
85-
<Reference Include="System.Net" />
86-
<Reference Include="System.Net.Http.Extensions, Version=2.2.22.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
87-
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.22\lib\net45\System.Net.Http.Extensions.dll</HintPath>
88-
<Private>True</Private>
89-
</Reference>
90-
<Reference Include="System.Net.Http.Primitives, Version=4.2.22.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
91-
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.22\lib\net45\System.Net.Http.Primitives.dll</HintPath>
92-
<Private>True</Private>
93-
</Reference>
94-
<Reference Include="System.Net.Http" />
95-
<Reference Include="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
96-
</ItemGroup>
9750
<ItemGroup>
9851
<Compile Include="AuthenticationStore.cs" />
9952
<Compile Include="Authentication\AadAuthenticationException.cs" />

‎src/Authentication.Abstractions/MSSharedLibKey.snk‎

-160 Bytes
Binary file not shown.

‎src/Authentication.Abstractions/packages.config‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,36 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Hyak.Common" version="1.0.3" targetFramework="net452" />
4-
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net452" />
5-
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net452" />
6-
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net452" />
7-
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
8-
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net452" />
9-
<package id="Microsoft.Net.Http" version="2.2.22" targetFramework="net452" />
3+
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
4+
<package id="Microsoft.ApplicationInsights" version="1.2.0" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
6+
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
7+
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net40" />
8+
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
9+
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
10+
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1011
<package id="Microsoft.Rest.ClientRuntime" version="2.3.12" targetFramework="net452" />
11-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
12+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.13" targetFramework="net452" />
13+
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.3.1" targetFramework="net452" />
14+
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.0" targetFramework="net45" />
15+
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net40" />
16+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
17+
18+
<!-- Test Packages -->
19+
<package id="Microsoft.Azure.Management.Resources" version="2.20.1-preview" targetFramework="net40" />
20+
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net452" />
21+
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
22+
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.8.1" targetFramework="net452" />
23+
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.7.2" targetFramework="net452" />
24+
<package id="Microsoft.WindowsAzure.Management.Compute" version="14.0.0" targetFramework="net45" />
25+
<package id="Microsoft.WindowsAzure.Management.Storage" version="6.0.1" targetFramework="net45" />
26+
<package id="Moq" version="4.2.1510.2205" targetFramework="net40" />
27+
<package id="MSTest.TestAdapter" version="1.3.2" targetFramework="net452" />
28+
<package id="MSTest.TestFramework" version="1.3.2" targetFramework="net452" />
29+
<package id="xunit" version="2.1.0" targetFramework="net452" />
30+
<package id="xunit.abstractions" version="2.0.0" targetFramework="net35" />
31+
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />
32+
<package id="xunit.core" version="2.1.0" targetFramework="net45" />
33+
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
34+
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
35+
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" developmentDependency="true" />
1236
</packages>

‎src/Authentication.ResourceManager/Authentication.ResourceManager.Netcore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
3131
<SignAssembly>true</SignAssembly>
3232
<DelaySign>true</DelaySign>
33-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
33+
<AssemblyOriginatorKeyFile>..\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
3434
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
3535
</PropertyGroup>
3636

‎src/Authentication.ResourceManager/Authentication.ResourceManager.csproj‎

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
3+
<Import Project="$(ProjectDir)..\Dependencies.targets" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -40,36 +40,13 @@
4040
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
4141
<ErrorReport>prompt</ErrorReport>
4242
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
43-
<CodeAnalysisRuleSetDirectories>;$(MSBuildProgramFiles32)\Microsoft Visual Studio\2017\Enterprise\Team Tools\Static Analysis Tools\Rule Sets\</CodeAnalysisRuleSetDirectories>
43+
<CodeAnalysisRuleSetDirectories>;$(MSBuildProgramFiles32)\Microsoft Visual Studio\2017\Enterprise\Team Tools\Static Analysis Tools\Rule Sets\;$(MSBuildProgramFiles32)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\</CodeAnalysisRuleSetDirectories>
4444
<SignAssembly>true</SignAssembly>
45-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
45+
<AssemblyOriginatorKeyFile>..\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
4646
<DelaySign>true</DelaySign>
4747
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
4848
<Prefer32Bit>false</Prefer32Bit>
4949
</PropertyGroup>
50-
<ItemGroup>
51-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
53-
<Private>True</Private>
54-
</Reference>
55-
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.28.3.860, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
57-
<Private>True</Private>
58-
</Reference>
59-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
60-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
61-
<Private>True</Private>
62-
</Reference>
63-
<Reference Include="System" />
64-
<Reference Include="System.Core" />
65-
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66-
<HintPath>..\..\lib\System.Management.Automation.dll</HintPath>
67-
<Private>True</Private>
68-
</Reference>
69-
<Reference Include="System.Net" />
70-
<Reference Include="System.Xml" />
71-
<Reference Include="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
72-
</ItemGroup>
7350
<ItemGroup>
7451
<Compile Include="AzureRmAutosaveProfile.cs" />
7552
<Compile Include="AzureRmProfile.cs" />
@@ -100,9 +77,6 @@
10077
<Compile Include="Serialization\LegacyAzureTenant.cs" />
10178
<Compile Include="Serialization\ModelConversionExtensions.cs" />
10279
</ItemGroup>
103-
<ItemGroup>
104-
<None Include="packages.config" />
105-
</ItemGroup>
10680
<ItemGroup>
10781
<EmbeddedResource Include="Properties\Resources.resx">
10882
<Generator>ResXFileCodeGenerator</Generator>

‎src/Authentication.ResourceManager/MSSharedLibKey.snk‎

-160 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)