Skip to content

Commit 3de4c83

Browse files
markcowlmarkcowl
authored
Merge pull request #7663 from maddieclayton/testing
Bump version of Newtonsoft Json in PowerShell
2 parents 53a4d2b + b5a97b3 commit 3de4c83

File tree

425 files changed

+735
-734
lines changed

Some content is hidden

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

425 files changed

+735
-734
lines changed

‎build.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,10 @@
358358
Condition="'$(SkipHelp)' == 'false'"
359359
ContinueOnError="false"/>
360360

361-
<CallTarget Targets="CodeSignBinaries" Condition="'$(CodeSign)' == 'true'" />
362-
363361
<!-- Cleanup extraneous files. -->
364362
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
363+
364+
<CallTarget Targets="CodeSignBinaries" Condition="'$(CodeSign)' == 'true'" />
365365
</Target>
366366

367367
<!-- Do everything possible except Publish -->

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
4-
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
3+
<package id="Hyak.Common" version="1.2.2" targetFramework="net452" />
4+
<package id="Microsoft.Azure.Common" version="2.2.1" targetFramework="net452" />
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
77
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
88
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
99
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
1010
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
11-
<package id="Microsoft.Rest.ClientRuntime" version="2.3.16" targetFramework="net452" />
12-
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.17" targetFramework="net452" />
11+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.17" targetFramework="net452" />
12+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.18" targetFramework="net452" />
1313
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
1414
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1515
</packages>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</PropertyGroup>
2626

2727
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
28-
<PackageReference Include="Microsoft.Azure.Management.Analysis" Version="2.0.3" />
28+
<PackageReference Include="Microsoft.Azure.Management.Analysis" Version="2.0.4" />
2929
</ItemGroup>
3030

3131
<ItemGroup>

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/Commands.AnalysisServices.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</PropertyGroup>
4545
<ItemGroup>
4646
<Reference Include="Microsoft.Azure.Management.Analysis, Version=2.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Analysis.2.0.3\lib\net452\Microsoft.Azure.Management.Analysis.dll</HintPath>
47+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Analysis.2.0.4\lib\net452\Microsoft.Azure.Management.Analysis.dll</HintPath>
4848
</Reference>
4949
</ItemGroup>
5050
<ItemGroup>

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.Analysis" version="2.0.3" targetFramework="net452" />
7+
<package id="Microsoft.Azure.Management.Analysis" version="2.0.4" targetFramework="net452" />
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.ResourceManager" version="1.9.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands.AnalysisServices.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</PropertyGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.Azure.Management.Analysis" Version="2.0.3" />
31+
<PackageReference Include="Microsoft.Azure.Management.Analysis" Version="2.0.4" />
3232
<PackageReference Include="Microsoft.NETCore.Platforms" Version="2.1.0" />
3333
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
3434
</ItemGroup>

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Commands.AnalysisServices.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="Microsoft.Azure.Management.Analysis, Version=2.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Analysis.2.0.3\lib\net452\Microsoft.Azure.Management.Analysis.dll</HintPath>
40+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Analysis.2.0.4\lib\net452\Microsoft.Azure.Management.Analysis.dll</HintPath>
4141
</Reference>
4242
</ItemGroup>
4343
<ItemGroup>

‎src/ResourceManager/AnalysisServices/Commands.AnalysisServices/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Azure.Management.Analysis" version="2.0.3" targetFramework="net452" />
3+
<package id="Microsoft.Azure.Management.Analysis" version="2.0.4" targetFramework="net452" />
44
</packages>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<ItemGroup>
3131
<PackageReference Include="AutoMapper" Version="6.2.2" />
32-
<PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.4-preview" />
32+
<PackageReference Include="Microsoft.Azure.Management.ApiManagement" Version="4.0.5-preview" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<Private>True</Private>
5454
</Reference>
5555
<Reference Include="Microsoft.Azure.Management.ApiManagement, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.4.0.4-preview\lib\net452\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
56+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.4.0.5-preview\lib\net452\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
5757
<Private>True</Private>
5858
</Reference>
5959
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

0 commit comments

Comments
 (0)