Skip to content

Commit 980ccde

Browse files
authored
Merge pull request Azure#3383 from shahabhijeet/fixSignBuild
Fix sign build break
2 parents a8fe81f + e130309 commit 980ccde

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<Scope Condition=" $(Scope) == '' " >all</Scope>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<CmdletSolutionsToBuild Include=".\src\Storage\Storage.sln;.\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln"
48+
<CmdletSolutionsToBuild Include=".\src\Storage\Storage.sln;.\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln;"
4949
Exclude=".\src\ResourceManager\Intune\*.sln"
5050
Condition=" '$(Scope)' == 'all' "/>
5151
<CmdletSolutionsToBuild Include=".\src\ResourceManager\$(Scope)\*.sln"

src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,7 @@
1717
<RestorePackages>true</RestorePackages>
1818
<TargetFrameworkProfile />
1919
<NuGetPackageImportStamp>94efee6d</NuGetPackageImportStamp>
20-
</PropertyGroup>
21-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
22-
<SignAssembly>true</SignAssembly>
23-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
24-
<DelaySign>true</DelaySign>
25-
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
26-
<Prefer32Bit>false</Prefer32Bit>
27-
</PropertyGroup>
20+
</PropertyGroup>
2821
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2922
<DebugSymbols>true</DebugSymbols>
3023
<DebugType>full</DebugType>
@@ -34,14 +27,18 @@
3427
<ErrorReport>prompt</ErrorReport>
3528
<WarningLevel>4</WarningLevel>
3629
</PropertyGroup>
37-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
38-
<OutputPath>bin\Release\</OutputPath>
30+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
31+
<OutputPath>bin\Release\</OutputPath>
3932
<DefineConstants>TRACE;SIGN</DefineConstants>
4033
<Optimize>true</Optimize>
4134
<DebugType>pdbonly</DebugType>
4235
<PlatformTarget>AnyCPU</PlatformTarget>
4336
<ErrorReport>prompt</ErrorReport>
4437
<RunCodeAnalysis>false</RunCodeAnalysis>
38+
<SignAssembly>true</SignAssembly>
39+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
40+
<DelaySign>true</DelaySign>
41+
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
4542
</PropertyGroup>
4643
<ItemGroup>
4744
<Reference Include="Hyak.Common">

src/ResourceManager/RedisCache/RedisCache.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage
2626
EndProject
2727
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Storage", "..\..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj", "{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}"
2828
EndProject
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Common", "..\..\ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}"
30+
EndProject
2931
Global
3032
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3133
Debug|Any CPU = Debug|Any CPU
@@ -76,6 +78,10 @@ Global
7678
{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.Build.0 = Debug|Any CPU
7779
{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.ActiveCfg = Release|Any CPU
7880
{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.Build.0 = Release|Any CPU
81+
{CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
82+
{CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
83+
{CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
84+
{CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.Build.0 = Release|Any CPU
7985
EndGlobalSection
8086
GlobalSection(SolutionProperties) = preSolution
8187
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)