Skip to content

Dev #65

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.

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
Nov 26, 2015
Merged

Dev #65

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
627b6cf
1) ARM compliance changes for Azure Site Recovery (ASR) Service.
avneeshraiusit Nov 9, 2015
b0571d2
updated SiteRecovery & RecoveryServices reference versions
sriramvu Nov 10, 2015
bfd7339
Merge remote-tracking branch 'upstream/SiteRecovery' into fromFM1
sriramvu Nov 10, 2015
a688837
taken PR comments for ASR SiteRecovery and RecoveryServices
sriramvu Nov 12, 2015
91210b4
corrected bcl, net.http and other versions
sriramvu Nov 12, 2015
45aed46
corrected Recovery Services hydra version
sriramvu Nov 13, 2015
9f8c671
updated packages.config too with the correct version of RecoveryServi…
sriramvu Nov 13, 2015
d9553a0
Merge pull request #1268 from AsrArmOneSdk/fromFM1
markcowl Nov 13, 2015
d3c8f93
New-AzureResourceGroupDeployment with KeyVault reference parameter
linweigao Nov 13, 2015
1f5b3de
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
chfunk Nov 17, 2015
4aff8e4
Update documentation to include intelligence pack functions
chfunk Nov 17, 2015
3026847
SiteRecovery changes to support RP version 2015-08-15
avneeshraiusit Nov 17, 2015
313281d
SiteRecovery Vault changes wrt to Version change
sriramvu Nov 17, 2015
4690466
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
chfunk Nov 17, 2015
f1d5bb5
Added checks in enable dr
avneeshraiusit Nov 17, 2015
2a519a0
updated hydra and recorded tests with latest version
sriramvu Nov 18, 2015
02ada0a
Merge branch 'fromFM1-avrai' of https://github.com/AsrArmOneSdk/azure…
sriramvu Nov 18, 2015
f046ff2
Test passed
linweigao Nov 18, 2015
5b848ce
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
linweigao Nov 18, 2015
dfefb13
removing a call in test which has dependency on current date for name…
sriramvu Nov 18, 2015
ac1e688
Merge pull request #1317 from AsrArmOneSdk/fromFM1-avrai
markcowl Nov 19, 2015
c0d9812
Update AssemblyInfo.cs
markcowl Nov 19, 2015
c8b5d44
Remove KeyVault cmdlets dependencies
linweigao Nov 19, 2015
35a9296
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
linweigao Nov 19, 2015
86ef593
Update AzureRM.psd1
markcowl Nov 20, 2015
9b04288
Renaming RecoveryServices ARM assembly
markcowl Nov 22, 2015
47e0246
updating versions
markcowl Nov 22, 2015
085faa1
Merge pull request #1336 from markcowl/siterecofix
markcowl Nov 22, 2015
f756159
removing notificationhubs from wxi
markcowl Nov 24, 2015
432ba84
Merge pull request #1342 from markcowl/rmnot
markcowl Nov 24, 2015
20848d7
Merge pull request #1311 from independentwork/dev
markcowl Nov 24, 2015
07bb331
Merge pull request #207 from Azure/dev
huangpf Nov 24, 2015
7bf7edf
Merge pull request #1329 from linweigao/dev
markcowl Nov 24, 2015
1053bcf
Deleted PowerShellGet msi
Nov 24, 2015
255818b
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
Nov 24, 2015
0823dbf
Fix issues with listing subscriptions for non-interactive and tenant-…
Nov 24, 2015
71babdf
Add -EnvironmentName parameter in Login-AzureRmAccount to accept envi…
Nov 24, 2015
84cd020
Update DeploymentTests.ps1
markcowl Nov 24, 2015
f106713
Update DeploymentTests.cs
markcowl Nov 25, 2015
82452ce
Merge pull request #1353 from Azure/FixKeyVaultTest
markcowl Nov 25, 2015
ad04c26
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
Nov 25, 2015
470dd16
Merge pull request #1354 from Azure/SiteRecovery
markcowl Nov 25, 2015
0548665
Merging SiteRecovery changes to dev branch
markcowl Nov 25, 2015
cae5ea8
Merge pull request #209 from Azure/dev
huangpf Nov 25, 2015
48ae917
Merge pull request #1355 from markcowl/srmerge
markcowl Nov 25, 2015
f8d749f
Merge pull request #211 from Azure/dev
huangpf Nov 25, 2015
a723261
Fixed NotificationHub release build.
Nov 25, 2015
5ade97d
Merge pull request #1352 from hovsepm/dev
Nov 25, 2015
b07160e
Merge pull request #213 from Azure/dev
huangpf Nov 25, 2015
25a349c
Bumped up Microsoft.Azure.Common.Authentication version to 1.4.0 for …
Nov 25, 2015
dac0284
Merge pull request #1348 from haocs/dev
stankovski Nov 26, 2015
268929b
Merge pull request #215 from Azure/dev
huangpf Nov 26, 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
20 changes: 0 additions & 20 deletions build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
<CmdletSolutionsToBuild Include=".\src\ServiceManagement\ServiceManagement.sln"
Condition=" '$(Scope)' == 'ServiceManagement' or '$(Scope)' == 'AzureStorage' "/>
<SetupSln Include=".\setup\azurepowershell.sln" />
<SetupPowershellGetSln Include=".\setup-powershellget\powershellget.sln" />
</ItemGroup>

<!--
Expand Down Expand Up @@ -80,13 +79,6 @@
Properties="Configuration=$(Configuration);Platform=Any CPU"
ContinueOnError="false" />

<MSBuild
Projects="@(SetupPowershellGetSln)"
Targets="Clean"
Properties="Configuration=$(Configuration);Platform=Any CPU"
ContinueOnError="false"
Condition=" '$(Scope)' == 'all' "/>

<!-- Delete the publish files -->
<Message Importance="high" Text="Cleaning publish files..." ContinueOnError="false" />
<ItemGroup>
Expand Down Expand Up @@ -161,14 +153,6 @@

<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />

<Message Importance="high" Text="Building Setup..." />
<MSBuild
Projects="@(SetupPowershellGetSln)"
Targets="Build"
Properties="Configuration=$(Configuration);Platform=Any CPU"
ContinueOnError="false"
Condition=" '$(Scope)' == 'all' "/>

<MSBuild
Projects="@(SetupSln)"
Targets="Build"
Expand Down Expand Up @@ -203,8 +187,6 @@
</GetFrameworkSdkPath>

<!-- Copying shortcut to be signed -->
<Copy SourceFiles="$(LibraryRoot)setup-powershellget\Setup\ShortcutStartup.ps1"
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psd1"
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
Expand Down Expand Up @@ -260,8 +242,6 @@
Condition="!$(DelaySign) and '@(DelaySignedAssembliesToSign)' != ''"/>

<!-- Copying signed shortcut back -->
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\ShortcutStartup.ps1"
DestinationFolder="$(LibraryRoot)setup-powershellget\Setup" />
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psd1"
DestinationFolder="$(LibraryRoot)tools\AzureRM" />
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psm1"
Expand Down
32 changes: 0 additions & 32 deletions setup-powershellget/Setup/CustomAction.config

This file was deleted.

110 changes: 0 additions & 110 deletions setup-powershellget/Setup/CustomAction.cs

This file was deleted.

48 changes: 0 additions & 48 deletions setup-powershellget/Setup/Properties/AssemblyInfo.cs

This file was deleted.

50 changes: 0 additions & 50 deletions setup-powershellget/Setup/Setup.csproj

This file was deleted.

Loading