Skip to content

Integrating from master to dev as a part of Release 0.9.5 #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 52 commits into from
Jul 20, 2015
Merged

Integrating from master to dev as a part of Release 0.9.5 #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
8c9a0e4
Adding Endpoints
ms-alguerra Jul 10, 2015
25b3827
Addressing comments
ms-alguerra Jul 11, 2015
cb5508d
Updating again sln
ms-alguerra Jul 11, 2015
71760f8
Fixing tests
ms-alguerra Jul 11, 2015
5c22301
Restoring sln version
ms-alguerra Jul 11, 2015
6400f21
Adding resourceGroup when listing
ms-alguerra Jul 12, 2015
aa30ba3
Adding a bunch of tests
ms-alguerra Jul 12, 2015
3ed40f7
Adding session records
ms-alguerra Jul 12, 2015
7318a03
Updating changelog
ms-alguerra Jul 12, 2015
ad68185
Adding storage v2 support to Sql audit cmdlets
yoavrubin Jul 13, 2015
89a9293
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
yoavrubin Jul 13, 2015
6e9ed40
Adding test of support of storage v2
yoavrubin Jul 13, 2015
33be4af
removing unneeded line in config + cleanup
yoavrubin Jul 13, 2015
dff1455
Removing initialization of storageV2 client
yoavrubin Jul 13, 2015
39c899e
Changes due to build break
yoavrubin Jul 13, 2015
c9c4242
Updating version
yoavrubin Jul 13, 2015
e933dfb
Re-adding storage v2 client
yoavrubin Jul 13, 2015
417ed60
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
yoavrubin Jul 14, 2015
894b36e
Updated build and changelog
yoavrubin Jul 14, 2015
a6e4ed7
Updating wxi
yoavrubin Jul 14, 2015
4318727
Merge pull request #1 from t-alguer/dev
vladca Jul 14, 2015
790b328
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
yoavrubin Jul 14, 2015
f760368
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
yoavrubin Jul 14, 2015
2855dc0
Merge pull request #51 from Azure/dev
huangpf Jul 14, 2015
e74c38f
Updating version to 0.9.5
markcowl Jul 14, 2015
f436eaf
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
vladca Jul 14, 2015
3d79512
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Jul 14, 2015
d30d6ac
Merge branch 'dev' of https://github.com/vladca/azure-powershell into…
Jul 14, 2015
363c87d
Merge pull request #606 from markcowl/release-0.9.5
markcowl Jul 14, 2015
2b84a78
upgraded resource Microsoft.Azure.Management.Resources to 2.18.1-preview
ailn Jul 15, 2015
44afa88
always check after nuget package manager!!!
ailn Jul 15, 2015
f74237d
removed app.config
ailn Jul 15, 2015
abfb937
Merge branch 'release-0.9.5' of https://github.com/Azure/azure-powers…
yoavrubin Jul 15, 2015
6c51fec
Merge pull request #610 from ailn/dev
stankovski Jul 15, 2015
1032483
Re-run tests that fail on Jenkins and update session records but no r…
Jul 15, 2015
f48508d
Merge branch 'release-0.9.5' of https://github.com/Azure/azure-powers…
yoavrubin Jul 15, 2015
6d80faf
Return type were internal making them public
Jul 15, 2015
4516147
Merge branch 'dev' into rel095_tm
Jul 15, 2015
39ed970
Fix ProjectGUID for ResourcesManagement.Automation.Test.csproj in re…
Jul 15, 2015
009e568
RouteNextHopTypeFix
deepakswifty Jul 16, 2015
3cb95db
Merge branch 'release-0.9.5' of https://github.com/Azure/azure-powers…
yoavrubin Jul 16, 2015
c2f2b1f
Fixing changelog formatting and wxi file deletions
markcowl Jul 16, 2015
ebf7ddb
Merge pull request #1 from markcowl/release-0.9.5
yoavrubin Jul 16, 2015
5ead947
Merge pull request #618 from DeepakRajendranMsft/RouteNextHopTypeFix
markcowl Jul 16, 2015
179166f
Merge pull request #616 from vladca/rel095_tm
markcowl Jul 16, 2015
aadc3c1
Updated changelog
markcowl Jul 16, 2015
10a4115
Merge pull request #2 from markcowl/release-0.9.5
yoavrubin Jul 16, 2015
300ee8d
Merge pull request #615 from yoavrubin/dev
markcowl Jul 16, 2015
6a8d431
Remove ValidateNotNullOrEmpty for DiskSizeInGB
huangpf Jul 16, 2015
cae7c15
Merge branch 'release-0.9.5' of https://github.com/Azure/azure-powers…
huangpf Jul 16, 2015
0dc37e5
Merge pull request #620 from huangpf/release-0.9.5
markcowl Jul 17, 2015
f151f39
Merge pull request #628 from Azure/release-0.9.5
amarzavery Jul 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
188 changes: 101 additions & 87 deletions ChangeLog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,93 +1,107 @@
2015.07.16 version 0.9.5
2015.07.17 version 0.9.5
* Azure SQL cmdlets
* Allowing to use of Storage V2 accounts in Auditing policies
* Azure RedisCache cmdlets
* Set-AzureRedisCache - Bug fix done in management API that fixes bug here as well
* Azure Network Resource Provider cmdlets
* Added Application Gateway cmdlets
* New-AzureApplicationGateway
* Start-AzureApplicationGateway
* Stop-AzureApplicationGateway
* SetAzureApplicationGateway
* GetAzureApplicationGateway
* RemoveAzureApplicationGateway
* Added Application Gateway Backend Address Pool cmdlets
* New-AzureApplicationGatewayBackendAddressPool
* Add-AzureApplicationGatewayBackendAddressPool
* Set-AzureApplicationGatewayBackendAddressPool
* Get-AzureApplicationGatewayBackendAddressPool
* Remove-AzureApplicationGatewayBackendAddressPool
* Added Application Gateway Backend HTTP Settings cmdlets
* New-AzureApplicationGatewayBackendHttpSettings
* Add-AzureApplicationGatewayBackendHttpSettings
* Set-AzureApplicationGatewayBackendHttpSettings
* Get-AzureApplicationGatewayBackendHttpSettings
* Remove-AzureApplicationGatewayBackendHttpSettings
* Added Application Gateway Frontend IP Configuration cmdlets
* New-AzureApplicationGatewayFrontendIPConfiguration
* Add-AzureApplicationGatewayFrontendIPConfiguration
* Set-AzureApplicationGatewayFrontendIPConfiguration
* Get-AzureApplicationGatewayFrontendIPConfiguration
* Remove-AzureApplicationGatewayFrontendIPConfiguration
* Added Application Gateway Frontend Port cmdlets
* New-AzureApplicationGatewayFrontendPort
* Add-AzureApplicationGatewayFrontendPort
* Set-AzureApplicationGatewayFrontendPort
* Get-AzureApplicationGatewayFrontendPort
* Remove-AzureApplicationGatewayFrontendPort
* Added Application Gateway IP Configuration cmdlets
* New-AzureApplicationGatewayGatewayIPConfiguration
* Add-AzureApplicationGatewayGatewayIPConfiguration
* Set-AzureApplicationGatewayGatewayIPConfiguration
* Get-AzureApplicationGatewayGatewayIPConfiguration
* Remove-AzureApplicationGatewayGatewayIPConfiguration
* Added Application Gateway HTTP Listener cmdlets
* New-AzureApplicationGatewayHttpListener
* Add-AzureApplicationGatewayHttpListener
* Set-AzureApplicationGatewayHttpListener
* Get-AzureApplicationGatewayHttpListener
* Remove-AzureApplicationGatewayHttpListener
* Added Application Gateway Request Routing Rule cmdlets
* New-AzureApplicationGatewayRequestRoutingRule
* Add-AzureApplicationGatewayRequestRoutingRule
* Set-AzureApplicationGatewayRequestRoutingRule
* Get-AzureApplicationGatewayRequestRoutingRule
* Remove-AzureApplicationGatewayRequestRoutingRule
* Added Application Gateway SKU cmdlets
* New-AzureApplicationGatewaySku
* Set-AzureApplicationGatewaySku
* Get-AzureApplicationGatewaySku
* Added Application Gateway SSL Certificate cmdlets
* New-AzureApplicationGatewaySslCertificate
* Add-AzureApplicationGatewaySslCertificate
* Set-AzureApplicationGatewaySslCertificate
* Get-AzureApplicationGatewaySslCertificate
* Remove-AzureApplicationGatewaySslCertificate
* Fixed minor bugs AzureLoadbalancer
* Renamed Get-AzureCheckDnsAvailablity to Test-AzureDnsAvailability
* Added cmdlets to RouteTables and Routes
* New-AzureRouteTable
* Get-AzureRouteTable
* Set-AzureRouteTable
* Remove-AzureRouteTable
* New-AzureRouteConfig
* Add-AzureRouteConfig
* Set-AzureRouteConfig
* Get-AzureRouteConfig
* Remove-AzureRouteConfig
*Azure Network cmdlets
* Reserved IP cmdlets (New-AzureReservedIP, Get-AzureReservedIP, Set-AzureReservedIPAssociation, Remove-AzureReservedIPAssociation) fixed to support -VirtualIPName parameter
* Multivip Cmdlets (Add-AzureVirtualIP, Remove-AzureVirtualIP) fixed to support -VirtualIPName parameter

2015.07.10 version 1.0.0
* Set-AzureRedisCache - Bug fix done in management API that fixes bug here as well, Make return type public
* New-AzureRedisCache - Make return type public
* Get-AzureRedisCache - Make return type public
* Azure Network Resource Provider cmdlets
* Added Application Gateway cmdlets
* New-AzureApplicationGateway
* Start-AzureApplicationGateway
* Stop-AzureApplicationGateway
* SetAzureApplicationGateway
* GetAzureApplicationGateway
* RemoveAzureApplicationGateway
* Added Application Gateway Backend Address Pool cmdlets
* New-AzureApplicationGatewayBackendAddressPool
* Add-AzureApplicationGatewayBackendAddressPool
* Set-AzureApplicationGatewayBackendAddressPool
* Get-AzureApplicationGatewayBackendAddressPool
* Remove-AzureApplicationGatewayBackendAddressPool
* Added Application Gateway Backend HTTP Settings cmdlets
* New-AzureApplicationGatewayBackendHttpSettings
* Add-AzureApplicationGatewayBackendHttpSettings
* Set-AzureApplicationGatewayBackendHttpSettings
* Get-AzureApplicationGatewayBackendHttpSettings
* Remove-AzureApplicationGatewayBackendHttpSettings
* Added Application Gateway Frontend IP Configuration cmdlets
* New-AzureApplicationGatewayFrontendIPConfiguration
* Add-AzureApplicationGatewayFrontendIPConfiguration
* Set-AzureApplicationGatewayFrontendIPConfiguration
* Get-AzureApplicationGatewayFrontendIPConfiguration
* Remove-AzureApplicationGatewayFrontendIPConfiguration
* Added Application Gateway Frontend Port cmdlets
* New-AzureApplicationGatewayFrontendPort
* Add-AzureApplicationGatewayFrontendPort
* Set-AzureApplicationGatewayFrontendPort
* Get-AzureApplicationGatewayFrontendPort
* Remove-AzureApplicationGatewayFrontendPort
* Added Application Gateway IP Configuration cmdlets
* New-AzureApplicationGatewayGatewayIPConfiguration
* Add-AzureApplicationGatewayGatewayIPConfiguration
* Set-AzureApplicationGatewayGatewayIPConfiguration
* Get-AzureApplicationGatewayGatewayIPConfiguration
* Remove-AzureApplicationGatewayGatewayIPConfiguration
* Added Application Gateway HTTP Listener cmdlets
* New-AzureApplicationGatewayHttpListener
* Add-AzureApplicationGatewayHttpListener
* Set-AzureApplicationGatewayHttpListener
* Get-AzureApplicationGatewayHttpListener
* Remove-AzureApplicationGatewayHttpListener
* Added Application Gateway Request Routing Rule cmdlets
* New-AzureApplicationGatewayRequestRoutingRule
* Add-AzureApplicationGatewayRequestRoutingRule
* Set-AzureApplicationGatewayRequestRoutingRule
* Get-AzureApplicationGatewayRequestRoutingRule
* Remove-AzureApplicationGatewayRequestRoutingRule
* Added Application Gateway SKU cmdlets
* New-AzureApplicationGatewaySku
* Set-AzureApplicationGatewaySku
* Get-AzureApplicationGatewaySku
* Added Application Gateway SSL Certificate cmdlets
* New-AzureApplicationGatewaySslCertificate
* Add-AzureApplicationGatewaySslCertificate
* Set-AzureApplicationGatewaySslCertificate
* Get-AzureApplicationGatewaySslCertificate
* Remove-AzureApplicationGatewaySslCertificate
* Fixed minor bugs AzureLoadbalancer
* Renamed Get-AzureCheckDnsAvailablity to Test-AzureDnsAvailability
* Added cmdlets to RouteTables and Routes
* New-AzureRouteTable
* Get-AzureRouteTable
* Set-AzureRouteTable
* Remove-AzureRouteTable
* New-AzureRouteConfig
* Add-AzureRouteConfig
* Set-AzureRouteConfig
* Get-AzureRouteConfig
* Remove-AzureRouteConfig
* Azure Network cmdlets
* Reserved IP cmdlets (New-AzureReservedIP, Get-AzureReservedIP, Set-AzureReservedIPAssociation, Remove-AzureReservedIPAssociation) fixed to support -VirtualIPName parameter
* Multivip Cmdlets (Add-AzureVirtualIP, Remove-AzureVirtualIP) fixed to support -VirtualIPName parameter
* Azure Backup cmdlets
*Added New-AzureBackupVault cmdlets
*Added Get-AzureBackupVault cmdlets
*Added Set-AzureBackupVault cmdlets
*Added Remove-AzureBackupVault cmdlets
*Added Get-AzureBackupVaultCredential cmdlets
*Added New-AzureBackupVault cmdlets
*Added Get-AzureBackupVault cmdlets
*Added Set-AzureBackupVault cmdlets
*Added Remove-AzureBackupVault cmdlets
*Added Get-AzureBackupVaultCredential cmdlets
* Azure Resource Manager cmdlets
* Fixed formatting of output for Get-UsageAggregates
* Fixed executing Get-UsageAggregates when first cmdlet being called.

* Fixed formatting of output for Get-UsageAggregates
* Fixed executing Get-UsageAggregates when first cmdlet being called.
* Added TrafficManager cmdlets
* Enable-AzureTrafficManagerProfile
* Disable-AzureTrafficManagerProfile
* New-AzureTrafficManagerEndpoint
* Get-AzureTrafficManagerEndpoint
* Set-AzureTrafficManagerEndpoint
* Remove-AzureTrafficManagerEndpoint
* Enable-AzureTrafficManagerEndpoint
* Disable-AzureTrafficManagerEndpoint
* Upgraded TrafficManager cmdlets
* Get-AzureTrafficManagerProfile
* Name is now optional (it will list all profiles in resource group)
* Resource group is now optional (it will list all profiles in subscription)
* Azure Data Factory cmdlets
* Upgraded management library to 1.0.0 with breaking JSON format change.
* Updated list operation paging support in cmdlets.
Expand Down
4 changes: 2 additions & 2 deletions setup/azurecmd.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

<?define productName="Microsoft Azure PowerShell - June 2015" ?>
<?define productName="Microsoft Azure PowerShell - July 2015" ?>
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>

<?define version="0.9.4" ?>
<?define version="0.9.5" ?>
<?define versionedStartMenuFolder="Microsoft Azure" ?>
<?define staleStartMenuFolder="Windows Azure" ?>

Expand Down
4 changes: 4 additions & 0 deletions setup/azurecmdfiles.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1515,6 +1515,9 @@
<Component Id="cmp95CE3E0A8DCAF570E9BB97BACD5D3D37" Guid="*">
<File Id="fil6C841008462630CCAC59CB99E8D9FFB1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.Management.Sql.dll" />
</Component>
<Component Id="cmpA6382DD7FA07C06254423D6530966AA3" Guid="*">
<File Id="fil7310B877A7D30750513E4C104A721DD2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.Management.Storage.dll" />
</Component>
<Component Id="cmpEC1BF12EB3CCE29C1628238CC52B4380" Guid="*">
<File Id="fil6B289741EE9328CDED33E1F242EF95C6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Sql\Microsoft.Azure.ResourceManager.dll" />
</Component>
Expand Down Expand Up @@ -4545,6 +4548,7 @@
<ComponentRef Id="cmpDA20E40FD1BE07A113851AFDBA89787D" />
<ComponentRef Id="cmp2C144B41FAE124CE1C9921E8B7DB9776" />
<ComponentRef Id="cmp95CE3E0A8DCAF570E9BB97BACD5D3D37" />
<ComponentRef Id="cmpA6382DD7FA07C06254423D6530966AA3" />
<ComponentRef Id="cmpEC1BF12EB3CCE29C1628238CC52B4380" />
<ComponentRef Id="cmp818CABBA9AFBAC0A3B15EBA346EF1EDD" />
<ComponentRef Id="cmpD1FFC10879A7E53D48A22EEACFB20B99" />
Expand Down
4 changes: 2 additions & 2 deletions src/Common/Commands.Common/AzurePowerShell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ public class AzurePowerShell

public const string AssemblyCopyright = "Copyright © Microsoft";

public const string AssemblyVersion = "0.9.4";
public const string AssemblyVersion = "0.9.5";

public const string AssemblyFileVersion = "0.9.4";
public const string AssemblyFileVersion = "0.9.5";

public const string ProfileFile = "AzureProfile.json";

Expand Down
17 changes: 14 additions & 3 deletions src/ResourceManager.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics.Te
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights", "ResourceManager\Insights\Commands.Insights\Commands.Insights.csproj", "{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManagement.Automation.Test", "ResourceManager\Automation\Commands.Automation.Test\Commands.ResourceManagement.Automation.Test.csproj", "{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManagement.Automation.Test", "ResourceManager\Automation\Commands.Automation.Test\Commands.ResourceManagement.Automation.Test.csproj", "{59D1B5DC-9175-43EC-90C6-CBA601B3565F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites", "ResourceManager\Websites\Commands.Websites\Commands.Websites.csproj", "{80A92297-7C92-456B-8EE7-9FB6CE30149D}"
EndProject
Expand All @@ -63,6 +63,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns", "ResourceMan
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns.Test", "ResourceManager\Dns\Commands.Dns.Test\Commands.Dns.Test.csproj", "{133561EC-99AF-4ADC-AF41-39C4D3AD323B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager2.Test", "ResourceManager\TrafficManager\Commands.TrafficManager2.Test\Commands.TrafficManager2.Test.csproj", "{5764A3A4-586C-4536-8481-13007CAC111B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager2", "ResourceManager\TrafficManager\Commands.TrafficManager2\Commands.TrafficManager2.csproj", "{270CBB5F-BB8A-4E33-B35B-95698E607D97}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -173,6 +177,14 @@ Global
{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Release|Any CPU.Build.0 = Release|Any CPU
{5764A3A4-586C-4536-8481-13007CAC111B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5764A3A4-586C-4536-8481-13007CAC111B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5764A3A4-586C-4536-8481-13007CAC111B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5764A3A4-586C-4536-8481-13007CAC111B}.Release|Any CPU.Build.0 = Release|Any CPU
{270CBB5F-BB8A-4E33-B35B-95698E607D97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{270CBB5F-BB8A-4E33-B35B-95698E607D97}.Debug|Any CPU.Build.0 = Debug|Any CPU
{270CBB5F-BB8A-4E33-B35B-95698E607D97}.Release|Any CPU.ActiveCfg = Release|Any CPU
{270CBB5F-BB8A-4E33-B35B-95698E607D97}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -188,9 +200,8 @@ Global
{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{13E031E4-8A43-4B87-9D72-D70180C31C11} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{F4ABAD68-64A5-4B23-B09C-42559A7524DE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{133561EC-99AF-4ADC-AF41-39C4D3AD323B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{13E031E4-8A43-4B87-9D72-D70180C31C11} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{5764A3A4-586C-4536-8481-13007CAC111B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
EndGlobalSection
EndGlobal
5 changes: 3 additions & 2 deletions .../Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApiManagement.1.0.2-preview\lib\net40\Microsoft.Azure.Management.ApiManagement.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<package id="Microsoft.Azure.Common.Authentication" version="1.0.27-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.ApiManagement" version="1.0.2-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion ...ourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Test.Framework, Version=1.0.5571.32271, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<package id="Microsoft.Azure.Common.Authentication" version="1.0.27-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.ApiManagement" version="1.0.2-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Resources" version="2.18.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5571.32271-prerelease" targetFramework="net45" />
Expand Down
Loading