Skip to content

Commit f64966c

Browse files
authored
Merge pull request Azure#8178 from MiYanni/remove-mssharedlibkey
Removes duplicate MSSharedLibKey.snk files
2 parents ecb0289 + 3cb0ef0 commit f64966c

File tree

128 files changed

+8
-50
lines changed

Some content is hidden

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

128 files changed

+8
-50
lines changed

src/ResourceManager/Advisor/Commands.Advisor.Test/Commands.Advisor.Test.Netcore.csproj

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
4-
53
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
7-
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Advisor.Test</AssemblyName>
8-
<RootNamespace>Microsoft.Azure.Commands.Advisor.Test</RootNamespace>
9-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
10-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
11-
<WarningsAsErrors />
12-
<IsPackable>false</IsPackable>
4+
<PsModuleName>Advisor</PsModuleName>
135
</PropertyGroup>
146

15-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
16-
<DelaySign>false</DelaySign>
17-
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
18-
</PropertyGroup>
7+
<Import Project="$(MSBuildThisFileDirectory)..\..\..\Az.Test.props" />
198

20-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
21-
<SignAssembly>true</SignAssembly>
22-
<DelaySign>true</DelaySign>
23-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
24-
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
9+
<PropertyGroup>
10+
<RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
2511
</PropertyGroup>
2612

2713
<ItemGroup>
-160 Bytes
Binary file not shown.

src/ResourceManager/Advisor/Commands.Advisor/Commands.Advisor.Netcore.csproj

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4+
<PsModuleName>Advisor</PsModuleName>
45
<OmitJsonPackage>true</OmitJsonPackage>
56
</PropertyGroup>
6-
7-
<Import Project="$(ProjectDir)..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
87

9-
<PropertyGroup>
10-
<TargetFramework>netstandard2.0</TargetFramework>
11-
<AssemblyName>Microsoft.Azure.PowerShell.Cmdlets.Advisor</AssemblyName>
12-
<RootNamespace>Microsoft.Azure.Commands.Advisor</RootNamespace>
13-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
14-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
15-
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
16-
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
17-
<OutputPath>$(ProjectDir)..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Az.Advisor\</OutputPath>
18-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
19-
<WarningsAsErrors />
20-
</PropertyGroup>
8+
<Import Project="$(MSBuildThisFileDirectory)..\..\..\Az.props" />
219

22-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
23-
<DelaySign>false</DelaySign>
24-
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
25-
</PropertyGroup>
26-
27-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
28-
<SignAssembly>true</SignAssembly>
29-
<DelaySign>true</DelaySign>
30-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
31-
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
10+
<PropertyGroup>
11+
<RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)</RootNamespace>
3212
</PropertyGroup>
3313

3414
<ItemGroup>
-160 Bytes
Binary file not shown.

src/ResourceManager/Advisor/NuGet.Config

Lines changed: 0 additions & 6 deletions
This file was deleted.
-160 Bytes
Binary file not shown.
-160 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)