Skip to content

Commit 8cadd6b

Browse files
committed
merge ignite_updatedns; ignite_team is now in sync with upstream Azure\ignite
2 parents b344f5f + cc54d87 commit 8cadd6b

22 files changed

+109
-499
lines changed

AzurePowershell.Test.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<XUnitTests Include=".\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll"/>
4343
<XUnitTests Include=".\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll"/>
4444
<XUnitTests Include=".\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll"/>
45+
<XUnitTests Include=".\src\ResourceManager\Dns\Commands.Dns.Test\bin\Debug\Microsoft.Azure.Commands.Dns.Test.dll"/>
4546
<XUnitTests Include=".\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"/>
4647
<XUnitTests Include=".\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
4748
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>

setup/azurecmdfiles.wxi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,6 @@
192192
<Component Id="cmp9F423DE1EC10EE4B17440C8718B09D66" Guid="*">
193193
<File Id="fil7E49D23147E54A39C5AE61DDA4E74B61" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Dns\Hyak.Common.dll" />
194194
</Component>
195-
<Component Id="cmp1F4A1CC3988AD9500AACA6F72A8675F2" Guid="*">
196-
<File Id="filBC80E790BEF96F5614BB1D90032D7C6E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Dns\Microsoft.Azure.Commands.Common.ResourceManager.dll" />
197-
</Component>
198195
<Component Id="cmpE0580556FFE65EA7BDDC69B9CC434223" Guid="*">
199196
<File Id="fil64779B6D8757862D4005A398189A7473" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Dns\Microsoft.Azure.Commands.Dns.dll" />
200197
</Component>
@@ -2543,7 +2540,6 @@
25432540
<ComponentRef Id="cmpBFF3EE7A4627288C2D2424BA1DF0FCE1" />
25442541
<ComponentRef Id="cmpC04498A4FB0FD84163A4FABEFAFC86C4" />
25452542
<ComponentRef Id="cmp9F423DE1EC10EE4B17440C8718B09D66" />
2546-
<ComponentRef Id="cmp1F4A1CC3988AD9500AACA6F72A8675F2" />
25472543
<ComponentRef Id="cmpE0580556FFE65EA7BDDC69B9CC434223" />
25482544
<ComponentRef Id="cmp9502ED70B8CD0376B466C356436D6362" />
25492545
<ComponentRef Id="cmp1265B13B26AD7D7C99BAEEE3AA269B6E" />

src/AzurePowershell.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RecoveryServices",
150150
EndProject
151151
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RecoveryServices.Test", "ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\Commands.RecoveryServices.Test.csproj", "{A415F75B-EB6A-49A6-934E-5BA71B83D6EB}"
152152
EndProject
153-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.ResourceManager", "ResourceManager\Common\Commands.Common.ResourceManager\Commands.Common.ResourceManager.csproj", "{AF98DEE9-F6AE-4E00-825A-5B9BC1052CED}"
154-
EndProject
155153
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns", "ResourceManager\Dns\Commands.Dns\Commands.Dns.csproj", "{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}"
156154
EndProject
157155
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns.Test", "ResourceManager\Dns\Commands.Dns.Test\Commands.Dns.Test.csproj", "{133561EC-99AF-4ADC-AF41-39C4D3AD323B}"
@@ -386,10 +384,6 @@ Global
386384
{A415F75B-EB6A-49A6-934E-5BA71B83D6EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
387385
{A415F75B-EB6A-49A6-934E-5BA71B83D6EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
388386
{A415F75B-EB6A-49A6-934E-5BA71B83D6EB}.Release|Any CPU.Build.0 = Release|Any CPU
389-
{AF98DEE9-F6AE-4E00-825A-5B9BC1052CED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
390-
{AF98DEE9-F6AE-4E00-825A-5B9BC1052CED}.Debug|Any CPU.Build.0 = Debug|Any CPU
391-
{AF98DEE9-F6AE-4E00-825A-5B9BC1052CED}.Release|Any CPU.ActiveCfg = Release|Any CPU
392-
{AF98DEE9-F6AE-4E00-825A-5B9BC1052CED}.Release|Any CPU.Build.0 = Release|Any CPU
393387
{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
394388
{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
395389
{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU

src/ResourceManager/Common/Commands.Common.ResourceManager/Commands.Common.ResourceManager.csproj

Lines changed: 0 additions & 96 deletions
This file was deleted.
Binary file not shown.

src/ResourceManager/Common/Commands.Common.ResourceManager/PSTagValuePair.cs

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/ResourceManager/Common/Commands.Common.ResourceManager/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/ResourceManager/Common/Commands.Common.ResourceManager/Properties/Resources.Designer.cs

Lines changed: 0 additions & 81 deletions
This file was deleted.

0 commit comments

Comments
 (0)