Skip to content
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

Terraform OOB Release #26349

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
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
6 changes: 2 additions & 4 deletions NuGet.Config
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<!-- Do not add any additional feeds if new packages are needed they need to come from nuget.org or our azure-sdk-for-net DevOps feed -->
<add key="local-feed" value="tools/LocalFeed" />
<add key="azure-powershell" value="https://pkgs.dev.azure.com/azclitools/public/_packaging/azure-powershell/nuget/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="azure-powershell-prod" value="https://pkgs.dev.azure.com/azclitools/release/_packaging/azure-powershell-prod/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
14 changes: 7 additions & 7 deletions src/Terraform/Terraform/Az.Terraform.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: Microsoft Corporation
#
# Generated on: 9/20/2024
# Generated on: 10/16/2024
#

@{
Expand All @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '0.1.0'
ModuleVersion = '0.1.1'

# Supported PSEditions
CompatiblePSEditions = 'Core', 'Desktop'
Expand Down Expand Up @@ -57,10 +57,10 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '3.0.4'; })
RequiredAssemblies = 'Terraform.Autorest/bin/Az.Terraform.private.dll'

# Script files (.ps1) that are run in the caller's environment prior to importing this module.
ScriptsToProcess = @()
# ScriptsToProcess = @()

# Type files (.ps1xml) to be loaded when importing this module
TypesToProcess = @()
# TypesToProcess = @()

# Format files (.ps1xml) to be loaded when importing this module
FormatsToProcess = 'Terraform.Autorest/Az.Terraform.format.ps1xml'
Expand Down Expand Up @@ -97,7 +97,7 @@ PrivateData = @{
PSData = @{

# Tags applied to this module. These help with module discovery in online galleries.
Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'Terraform'
Tags = 'Azure','ResourceManager','ARM','PSModule','Terraform'

# A URL to the license for this module.
LicenseUri = 'https://aka.ms/azps-license'
Expand All @@ -109,7 +109,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
# ReleaseNotes = ''
ReleaseNotes = '* Fixed descrption for this module'

# Prerelease string of this module
# Prerelease = ''
Expand All @@ -122,7 +122,7 @@ PrivateData = @{

} # End of PSData hashtable

} # End of PrivateData hashtable
} # End of PrivateData hashtable

# HelpInfo URI of this module
# HelpInfoURI = ''
Expand Down
2 changes: 2 additions & 0 deletions src/Terraform/Terraform/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
- Additional information about change #1
-->
## Upcoming Release

## Version 0.1.1
* Fixed descrption for this module

## Version 0.1.0
Expand Down
4 changes: 2 additions & 2 deletions src/Terraform/Terraform/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[assembly: Guid("d35ca6f5-081e-4708-9333-84d3408e336d")]
[assembly: AssemblyVersion("0.1.0")]
[assembly: AssemblyFileVersion("0.1.0")]
[assembly: AssemblyVersion("0.1.1")]
[assembly: AssemblyFileVersion("0.1.1")]
4 changes: 2 additions & 2 deletions tools/AzPreview/AzPreview.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '3.0.4'; },
@{ModuleName = 'Az.Quota'; RequiredVersion = '0.1.2'; },
@{ModuleName = 'Az.RecoveryServices'; RequiredVersion = '7.2.0'; },
@{ModuleName = 'Az.RedisCache'; RequiredVersion = '1.10.0'; },
@{ModuleName = 'Az.RedisEnterpriseCache'; RequiredVersion = '1.2.1'; },
@{ModuleName = 'Az.RedisEnterpriseCache'; RequiredVersion = '1.3.0'; },
@{ModuleName = 'Az.Relay'; RequiredVersion = '2.0.1'; },
@{ModuleName = 'Az.Reservations'; RequiredVersion = '0.13.0'; },
@{ModuleName = 'Az.ResourceGraph'; RequiredVersion = '1.0.0'; },
Expand Down Expand Up @@ -225,7 +225,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '3.0.4'; },
@{ModuleName = 'Az.Subscription'; RequiredVersion = '0.11.1'; },
@{ModuleName = 'Az.Support'; RequiredVersion = '2.0.0'; },
@{ModuleName = 'Az.Synapse'; RequiredVersion = '3.0.10'; },
@{ModuleName = 'Az.Terraform'; RequiredVersion = '0.1.0'; },
@{ModuleName = 'Az.Terraform'; RequiredVersion = '0.1.1'; },
@{ModuleName = 'Az.TimeSeriesInsights'; RequiredVersion = '0.2.2'; },
@{ModuleName = 'Az.TrafficManager'; RequiredVersion = '1.2.2'; },
@{ModuleName = 'Az.VMware'; RequiredVersion = '0.7.1'; },
Expand Down
4 changes: 2 additions & 2 deletions tools/Docs/az-ps-latest-2.csv
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pac25,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-relea
pac26,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Quota.0.1.2.zip;sourceType=sa]Az.Quota,0.1.2
pac27,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.RecoveryServices.7.2.0.zip;sourceType=sa]Az.RecoveryServices,7.2.0
pac28,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.RedisCache.1.10.0.zip;sourceType=sa]Az.RedisCache,1.10.0
pac29,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.RedisEnterpriseCache.1.2.1.zip;sourceType=sa]Az.RedisEnterpriseCache,1.2.1
pac29,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.RedisEnterpriseCache.1.3.0.zip;sourceType=sa]Az.RedisEnterpriseCache,1.3.0
pac30,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Relay.2.0.1.zip;sourceType=sa]Az.Relay,2.0.1
pac31,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Reservations.0.13.0.zip;sourceType=sa]Az.Reservations,0.13.0
pac32,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.ResourceGraph.1.0.0.zip;sourceType=sa]Az.ResourceGraph,1.0.0
Expand Down Expand Up @@ -58,7 +58,7 @@ pac56,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-relea
pac57,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Subscription.0.11.1.zip;sourceType=sa]Az.Subscription,0.11.1
pac58,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Support.2.0.0.zip;sourceType=sa]Az.Support,2.0.0
pac59,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Synapse.3.0.10.zip;sourceType=sa]Az.Synapse,3.0.10
pac60,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Terraform.0.1.0.zip;sourceType=sa]Az.Terraform,0.1.0
pac60,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Terraform.0.1.1.zip;sourceType=sa]Az.Terraform,0.1.1
pac61,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.TimeSeriesInsights.0.2.2.zip;sourceType=sa]Az.TimeSeriesInsights,0.2.2
pac62,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.TrafficManager.1.2.2.zip;sourceType=sa]Az.TrafficManager,1.2.2
pac63,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.VMware.0.7.1.zip;sourceType=sa]Az.VMware,0.7.1
Expand Down
4 changes: 2 additions & 2 deletions tools/NugetAuth/OneBranchNuget.Config
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<packageSources>
<clear />
<!-- Do not add any additional feeds if new packages are needed they need to come from nuget.org or our azure-sdk-for-net DevOps feed -->
<add key="azure-powershell-prod" value="https://pkgs.dev.azure.com/azclitools/public/_packaging/azure-powershell-prod/nuget/v3/index.json" />
<add key="azure-powershell-prod" value="https://pkgs.dev.azure.com/azclitools/release/_packaging/azure-powershell-prod/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
</disabledPackageSources>
</configuration>
</configuration>
6 changes: 5 additions & 1 deletion tools/NugetAuth/ReplaceOneBranchConfig.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
$oneBranchConfigPath = Join-Path $PSScriptRoot 'OneBranchNuget.Config'
$devConfigPath = Join-Path ($PSScriptRoot | Split-path -Parent | Split-path -Parent) 'Nuget.Config'

Get-Content $oneBranchConfigPath -Raw | Set-Content $devConfigPath -Force
$oneBranchContent = Get-Content $oneBranchConfigPath -Raw
$devContent = Get-Content $devConfigPath -Raw

$oneBranchContent | Set-Content $devConfigPath -Force
$devContent | Set-Content oneBranchConfigPath -Force
Loading