Skip to content

Commit b7bc460

Browse files
MiYanniMiYanni
authored
Merge pull request #1 from twitchax/RemoveHttpNuget
Fix for AppDomain clash.
2 parents 84c8c73 + c0a2ccf commit b7bc460

File tree

4 files changed

+35
-21
lines changed

4 files changed

+35
-21
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
sudo: required
22
language: csharp
33
mono: none
4-
dotnet: 2.0.0
4+
dotnet: 2.1.2
55
dist: trusty
66

77
env:

‎build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
<Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) AzureRM.Netcore -Profile Latest &quot; " Condition="'$(Latest)' == 'true' and '$(CodeSign)' == 'false'"/>
316316

317317
<!-- Generate the help. -->
318-
<Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\GenerateHelp.ps1 -GenerateMamlHelp -BuildConfig $(Configuration) &quot;" ContinueOnError="true" Condition=" '$(SkipHelp)' == 'false' and '$(Latest)' == 'true'"/>
318+
<Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;Set-Variable -Name ProgressPreference -Value 'SilentlyContinue';. $(LibraryToolsFolder)\GenerateHelp.ps1 -GenerateMamlHelp -BuildConfig $(Configuration) &quot;" ContinueOnError="true" Condition=" '$(SkipHelp)' == 'false' and '$(Latest)' == 'true'"/>
319319

320320
<!-- Cleanup extraneous files. -->
321321
<Exec Command="&quot;$(PowerShellCoreCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Common.ResourceManager.ScenarioTests.Netcore.csproj

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
26-
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.8.1,2.0.0)" />
27-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.6.0,2.0.0)" />
28-
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.8" />
29-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.8" />
26+
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="1.8.1" />
27+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="1.7.2" />
28+
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.10" />
29+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.10" />
3030
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.6.0-preview" />
31-
<PackageReference Include="Moq" Version="4.7.10" />
31+
<PackageReference Include="Moq" Version="4.7.145" />
3232
<PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
3333

3434
<!-- This is needed for discovering tests in test explorer -->
3535
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
36-
<PackageReference Include="xunit" Version="2.3.0-beta2-build3683" />
37-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta2-build1317" />
38-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170502-03" />
36+
<PackageReference Include="xunit" Version="2.3.1" />
37+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
38+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
3939
</ItemGroup>
4040

4141
<ItemGroup>
@@ -44,9 +44,17 @@
4444
</ItemGroup>
4545

4646
<ItemGroup>
47-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.0.0-beta2" />
47+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.0-beta2" />
4848
</ItemGroup>
4949

50+
<Target Name="ChangeAliasesOfStrongNameAssemblies" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
51+
<ItemGroup>
52+
<ReferencePath Condition="'%(FileName)' == 'System.AppDomain'">
53+
<Aliases>dummy</Aliases>
54+
</ReferencePath>
55+
</ItemGroup>
56+
</Target>
57+
5058
<ItemGroup>
5159
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication.Abstractions\Common.Authentication.Abstractions.Netcore.csproj" />
5260
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication\Common.Authentication.Netcore.csproj" />

‎src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.Netcore.csproj

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,31 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
26-
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.8.1,2.0.0)" />
27-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.6.0,2.0.0)" />
28-
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.8" />
29-
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.8" />
26+
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="1.8.1" />
27+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="1.7.2" />
28+
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.10" />
29+
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.10" />
3030
<PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
3131

3232
<!-- This is needed for discovering tests in test explorer -->
3333
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
34-
<PackageReference Include="xunit" Version="2.3.0-beta2-build3683" />
35-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta2-build1317" />
36-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170502-03" />
37-
<PackageReference Include="Microsoft.PowerShell.Commands.Diagnostics" Version="6.0.0-rc" />
38-
<PackageReference Include="Microsoft.WSMan.Management" Version="6.0.0-rc" />
34+
<PackageReference Include="xunit" Version="2.3.1" />
35+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
36+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
3937
</ItemGroup>
4038

4139
<ItemGroup>
42-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.0.0-beta2" />
40+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.0-beta2" />
4341
</ItemGroup>
4442

43+
<Target Name="ChangeAliasesOfStrongNameAssemblies" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
44+
<ItemGroup>
45+
<ReferencePath Condition="'%(FileName)' == 'System.AppDomain'">
46+
<Aliases>dummy</Aliases>
47+
</ReferencePath>
48+
</ItemGroup>
49+
</Target>
50+
4551
<ItemGroup>
4652
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication.Abstractions\Common.Authentication.Abstractions.Netcore.csproj" />
4753
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication\Common.Authentication.Netcore.csproj" />

0 commit comments

Comments
 (0)