Skip to content

Commit 000e415

Browse files
authored
Merge pull request Azure#4763 from cormacpayne/release-4.4.1
Fix errors in release build
2 parents 4bf8e95 + 904c8ef commit 000e415

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

src/ResourceManager/Common/Commands.ResourceManager.Common/Location/LocationCompleter.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ protected static IDictionary<string, ICollection<string>> ResourceTypeLocationDi
7979
catch (Exception ex)
8080
{
8181
_resourceTypeLocationDictionary[contextHash] = new ConcurrentDictionary<string, ICollection<string>>(StringComparer.OrdinalIgnoreCase);
82+
if (ex == null) { }
8283
#if DEBUG
8384
throw ex;
8485
#endif
@@ -135,7 +136,7 @@ public static string[] FindLocations(string[] resourceTypes, IDictionary<string,
135136
}
136137
}
137138

138-
string[] distinctLocations;
139+
string[] distinctLocations = { };
139140
if (validResourceTypes.Count > 0)
140141
{
141142
distinctLocations = resourceTypeLocationDictionary[validResourceTypes[0]].ToArray();

src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute.Test/Commands.MachineLearningCompute.Test.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
<SpecificVersion>False</SpecificVersion>
4545
<HintPath>..\..\..\packages\Hyak.Common.1.0.3\lib\net45\Hyak.Common.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Microsoft.Azure.Commands.Common.Authentication.Abstractions">
48-
<HintPath>..\..\..\Common\Commands.Common.Authentication.Abstractions\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll</HintPath>
49-
</Reference>
5047
<Reference Include="Microsoft.Azure.Common">
5148
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
5249
</Reference>
@@ -223,4 +220,4 @@
223220
<PostBuildEvent>
224221
</PostBuildEvent>
225222
</PropertyGroup>
226-
</Project>
223+
</Project>

src/ResourceManager/MachineLearningCompute/Commands.MachineLearningCompute/Commands.MachineLearningCompute.csproj

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,6 @@
4747
<DelaySign>true</DelaySign>
4848
<Prefer32Bit>false</Prefer32Bit>
4949
</PropertyGroup>
50-
<PropertyGroup>
51-
<SignAssembly>false</SignAssembly>
52-
</PropertyGroup>
53-
<PropertyGroup>
54-
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
55-
</PropertyGroup>
56-
<PropertyGroup>
57-
<DelaySign>true</DelaySign>
58-
</PropertyGroup>
5950
<ItemGroup>
6051
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication.Abstractions\Commands.Common.Authentication.Abstractions.csproj">
6152
<Project>{70527617-7598-4AEF-B5BD-DB9186B8184B}</Project>
@@ -123,4 +114,4 @@
123114
</ItemGroup>
124115
<Copy SourceFiles="@(MarkdownFiles)" DestinationFolder="$(OutputPath)\help\" ContinueOnError="false" />
125116
</Target>
126-
</Project>
117+
</Project>

0 commit comments

Comments
 (0)