Skip to content

Commit 18ed8ce

Browse files
markcowlmarkcowl
authored
Merge pull request #2889 from markcowl/addpsmstack
Update build infrastructure for AzureStack release
2 parents d33bc1a + dd531ae commit 18ed8ce

File tree

46 files changed

+478
-728
lines changed

Some content is hidden

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

46 files changed

+478
-728
lines changed

‎build.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@
188188
<Output TaskParameter="Path" PropertyName="WindowsSdkPath"/>
189189
</GetFrameworkSdkPath>
190190

191+
<Exec Command="$(PowerShellCommand) -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 $(Configuration) $(Scope) &quot;"/>
191192
<!-- Copying shortcut to be signed -->
192193
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psd1"
193194
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />

‎setup/azurecmd.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
33

4-
<?define productName="Microsoft Azure PowerShell for Azure Stack TP2 - August 2016" ?>
4+
<?define productName="Microsoft Azure PowerShell for Azure Stack TP2 - September 2016" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="1.2.5.4" ?>
8+
<?define version="1.2.6" ?>
99

1010
<Product Id="*"
1111
Name="$(var.productName)"

‎src/Common/Commands.Common/AzurePowerShell.cs

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

3030
public const string AssemblyVersion = "1.0.0";
3131

32-
public const string AssemblyFileVersion = "1.0.4";
32+
public const string AssemblyFileVersion = "1.0.4.1";
3333

3434
public const string ProfileFile = "AzureProfile.json";
3535

‎src/Common/Storage/Azure.Storage.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ CLRVersion='4.0'
4545
ProcessorArchitecture = 'None'
4646

4747
# Modules that must be imported into the global environment prior to importing this module
48-
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4.1'})
4949

5050
# Assemblies that must be loaded prior to importing this module
5151
RequiredAssemblies = @()

‎src/Common/Storage/Commands.Storage/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
// You can specify all the values or you can default the Build and Revision Numbers
4545
// by using the '*' as shown below:
4646
// [assembly: AssemblyVersion("1.0.*")]
47-
[assembly: AssemblyVersion("1.0.4")]
48-
[assembly: AssemblyFileVersion("1.0.4")]
47+
[assembly: AssemblyVersion("1.0.4.1")]
48+
[assembly: AssemblyFileVersion("1.0.4.1")]
4949

5050
#if SIGN
5151
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Storage.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

‎src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
// You can specify all the values or you can default the Build and Revision Numbers
4343
// by using the '*' as shown below:
4444

45-
[assembly: AssemblyVersion("1.0.4")]
46-
[assembly: AssemblyFileVersion("1.0.4")]
45+
[assembly: AssemblyVersion("1.0.4.1")]
46+
[assembly: AssemblyFileVersion("1.0.4.1")]

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@
4141
// You can specify all the values or you can default the Build and Revision Numbers
4242
// by using the '*' as shown below:
4343

44-
[assembly: AssemblyVersion("1.0.4")]
45-
[assembly: AssemblyFileVersion("1.0.4")]
44+
[assembly: AssemblyVersion("1.0.4.1")]
45+
[assembly: AssemblyFileVersion("1.0.4.1")]

‎src/ResourceManager/Automation/Commands.Automation/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
// You can specify all the values or you can default the Build and Revision Numbers
4444
// by using the '*' as shown below:
4545

46-
[assembly: AssemblyVersion("1.0.4")]
47-
[assembly: AssemblyFileVersion("1.0.4")]
46+
[assembly: AssemblyVersion("1.0.4.1")]
47+
[assembly: AssemblyFileVersion("1.0.4.1")]
4848
#if SIGN
4949
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.ResourceManager.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
5050
#else

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
[assembly: ComVisible(false)]
3232
[assembly: CLSCompliant(false)]
3333

34-
[assembly: AssemblyVersion("1.0.4")]
35-
[assembly: AssemblyFileVersion("1.0.4")]
34+
[assembly: AssemblyVersion("1.0.4.1")]
35+
[assembly: AssemblyFileVersion("1.0.4.1")]

‎src/ResourceManager/AzureBatch/Commands.Batch/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
[assembly: ComVisible(false)]
2626
[assembly: CLSCompliant(false)]
2727
[assembly: Guid("ed102280-3577-49bf-93dd-11b6e3a44a57")]
28-
[assembly: AssemblyVersion("1.0.4")]
29-
[assembly: AssemblyFileVersion("1.0.4")]
28+
[assembly: AssemblyVersion("1.0.4.1")]
29+
[assembly: AssemblyFileVersion("1.0.4.1")]
3030
#if SIGN
3131
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Batch.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
3232
#else

0 commit comments

Comments
 (0)