Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
148 changes: 88 additions & 60 deletions setup/azurecmdfiles.wxi

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,16 @@
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="AnalysisServicesDataplaneStartup.ps1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Azure.AnalysisServices.psd1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="MSSharedLibKey.snk" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace Microsoft.Azure.Commands.AnalysisServices.Dataplane
[Cmdlet("Add", "AzureAnalysisServicesAccount", DefaultParameterSetName = "UserParameterSetName", SupportsShouldProcess =true)]
[Alias("Login-AzureAsAccount")]
[OutputType(typeof(AsAzureProfile))]
public class AddAzureASAccountCommand : AzurePSCmdlet, IModuleAssemblyInitializer
public class AddAzureASAccountCommand : AzurePSCmdlet
{
private const string UserParameterSet = "UserParameterSetName";
private const string ServicePrincipalWithPasswordParameterSet = "ServicePrincipalWithPasswordParameterSetName";
Expand Down Expand Up @@ -189,22 +189,5 @@ public override void ExecuteCmdlet()
WriteObject(asAzureProfile);
}
}

public void OnImport()
{
try
{
System.Management.Automation.PowerShell invoker = null;
invoker = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace);
invoker.AddScript(File.ReadAllText(FileUtilities.GetContentFilePath(
Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
"AnalysisServicesDataplaneStartup.ps1")));
invoker.Invoke();
}
catch
{
// This will throw exception for tests, ignore.
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
"Login-AzureAsAccount" = "Add-AzureAnalysisServicesAccount";
"Restart-AzureAsInstance" = "Restart-AzureAnalysisServicesInstance";
"Sync-AzureAsInstance" = "Sync-AzureAnalysisServicesInstance";
}.GetEnumerator() | Select @{Name='Name'; Expression={$_.Key}}, @{Name='Value'; Expression={$_.Value}} | New-Alias -Description "AzureAlias"
}.GetEnumerator() | Select @{Name='Name'; Expression={$_.Key}}, @{Name='Value'; Expression={$_.Value}} | Set-Alias -Description "AzureAlias"
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,9 @@
<SubType>Designer</SubType>
</None>
<None Include="MSSharedLibKey.snk" />
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\..\..\tools\Common.Dependencies.targets" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ApplicationInsights.0.1.1-preview\lib\net452\Microsoft.Azure.Management.ApplicationInsights.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
</ItemGroup>
<ItemGroup>
<Compile Include="ApplicationInsights\GetApplicationInsightsApiKey.cs" />
Expand Down Expand Up @@ -96,6 +96,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication.Abstractions\Commands.Common.Authentication.Abstractions.csproj">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
</None>
<None Include="MSSharedLibKey.snk" />
<None Include="packages.config" />
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
2 changes: 1 addition & 1 deletion src/ResourceManager/Cdn/AzureRM.Cdn.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ CmdletsToExport = 'Get-AzureRmCdnProfile', 'Get-AzureRmCdnProfileSsoUrl',
# VariablesToExport = @()

# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
AliasesToExport = @()
AliasesToExport = 'Validate-AzureRmCdnCustomDomain'

# DSC resources to export from this module
# DscResourcesToExport = @()
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Cdn/Commands.Cdn/Commands.Cdn.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="CdnStartup.ps1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<None Include="StartupScripts\*.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
namespace Microsoft.Azure.Commands.Cdn.CustomDomain
{
[Cmdlet(VerbsCommon.New, "AzureRmCdnCustomDomain", DefaultParameterSetName = FieldsParameterSet, SupportsShouldProcess = true), OutputType(typeof(PSCustomDomain))]
public class NewAzureRmCdnCustomDomain : AzureCdnCmdletBase, IModuleAssemblyInitializer
public class NewAzureRmCdnCustomDomain : AzureCdnCmdletBase
{
[Parameter(Mandatory = true, HelpMessage = "Host name (address) of the Azure CDN custom domain name.")]
[ValidateNotNullOrEmpty]
Expand Down Expand Up @@ -101,22 +101,5 @@ private void NewCustomDomain()
WriteVerbose(Resources.Success);
WriteObject(customDomain.ToPsCustomDomain());
}

public void OnImport()
{
try
{
System.Management.Automation.PowerShell invoker = null;
invoker = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace);
invoker.AddScript(File.ReadAllText(FileUtilities.GetContentFilePath(
Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory),
"CdnStartup.ps1")));
invoker.Invoke();
}
catch
{
// This may throw exception for tests, ignore.
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

@{
"Validate-AzureRmCdnCustomDomain" = "Test-AzureRmCdnCustomDomain";
}.GetEnumerator() | Select @{Name='Name'; Expression={$_.Key}}, @{Name='Value'; Expression={$_.Value}} | New-Alias -Description "AzureAlias"
}.GetEnumerator() | Select @{Name='Name'; Expression={$_.Key}}, @{Name='Value'; Expression={$_.Value}} | Set-Alias -Description "AzureAlias"
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication.Abstractions\Commands.Common.Authentication.Abstractions.csproj">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
</None>
<None Include="MSSharedLibKey.snk" />
<None Include="packages.config" />
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
<None Include="..\AzureRM.ContainerInstance.psd1">
<Link>AzureRM.ContainerInstance.psd1</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@
</None>
<None Include="MSSharedLibKey.snk" />
<None Include="packages.config" />
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication.Abstractions\Commands.Common.Authentication.Abstractions.csproj">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@
</None>
<None Include="MSSharedLibKey.snk" />
<None Include="packages.config" />
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@
</None>
<None Include="MSSharedLibKey.snk" />
<None Include="packages.config" />
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
<Compile Include="Commands\DtlPolicyCmdletBase.cs" />
<Compile Include="Commands\Set\SetAzureRmDtlVMsPerUserPolicy.cs" />
<Compile Include="Commands\Set\SetAzureRmDtlAllowedVMSizesPolicy.cs" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
3 changes: 3 additions & 0 deletions src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@
</None>
<None Include="MSSharedLibKey.snk" />
<None Include="packages.config" />
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\..\..\tools\Common.Dependencies.targets" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="StartupScripts\*.ps1">
<!-- <CopyToOutputDirectory>Always</CopyToOutputDirectory> -->
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources.resx" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#Placeholder for future scripts: Please delete this file and uncomment <CopyToOutputDirectory>Always</CopytoOutputDirectory> within the <None Include="StartupScripts\*.ps1"> block in the .csproj file.
Loading