Skip to content

Commit fde1923

Browse files
jamesvoongmsjamesvoongms
committed
Additional fixes for main merge
1 parent c05f12e commit fde1923

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

‎src/DnsResolver/DnsResolver.Autorest/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
2121
[assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
2222
[assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - DnsResolver")]
23-
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.1.1")]
24-
[assembly: System.Reflection.AssemblyVersionAttribute("1.1.1")]
23+
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.3.0")]
24+
[assembly: System.Reflection.AssemblyVersionAttribute("1.3.0")]
2525
[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
26-
[assembly: System.CLSCompliantAttribute(false)]
26+
[assembly: System.CLSCompliantAttribute(false)]

‎src/DnsResolver/DnsResolver.Autorest/generate-info.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"generate_Id": "dddae1c8-537b-4675-9ae6-78580ed673be"
2+
"generate_Id": "04569338-98d4-4223-acae-a3b0ce7b8e89"
33
}

‎src/DnsResolver/DnsResolver.sln‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DnsResolver", "DnsResolver\
2121
EndProject
2222
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DnsResolver.Autorest", "DnsResolver.Autorest", "{FDE7DBBB-20D7-0A02-9AE8-981A0BC85643}"
2323
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.DnsResolver", "..\..\generated\DnsResolver\DnsResolver.Autorest\Az.DnsResolver.csproj", "{DE11DC8C-8855-468C-9E85-912B0DA7387A}"
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.DnsResolver", "..\..\generated\DnsResolver\DnsResolver.Autorest\Az.DnsResolver.csproj", "{22B8BBB5-6984-41CE-8B3B-2CC8F325D129}"
2525
EndProject
2626
Global
2727
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -117,18 +117,18 @@ Global
117117
{2A671912-B43B-464C-9244-019BC1F1A2D7}.Release|x64.Build.0 = Release|Any CPU
118118
{2A671912-B43B-464C-9244-019BC1F1A2D7}.Release|x86.ActiveCfg = Release|Any CPU
119119
{2A671912-B43B-464C-9244-019BC1F1A2D7}.Release|x86.Build.0 = Release|Any CPU
120-
{DE11DC8C-8855-468C-9E85-912B0DA7387A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121-
{DE11DC8C-8855-468C-9E85-912B0DA7387A}.Debug|Any CPU.Build.0 = Debug|Any CPU
122-
{DE11DC8C-8855-468C-9E85-912B0DA7387A}.Debug|x64.ActiveCfg = Debug|Any CPU
123-
{DE11DC8C-8855-468C-9E85-912B0DA7387A}.Debug|x64.Build.0 = Debug|Any CPU
124-
{DE11DC8C-8855-468C-9E85-912B0DA7387A}.Debug|x86.ActiveCfg = Debug|Any CPU
125-
{DE11DC8C-8855-468C-9E85-912B0DA7387A}.Debug|x86.Build.0 = Debug|Any CPU
126-
{DE11DC8C-8855-468C-9E85-912B0DA7387A}.Release|Any CPU.ActiveCfg = Release|Any CPU
127-
{DE11DC8C-8855-468C-9E85-912B0DA7387A}.Release|Any CPU.Build.0 = Release|Any CPU
128-
{DE11DC8C-8855-468C-9E85-912B0DA7387A}.Release|x64.ActiveCfg = Release|Any CPU
129-
{DE11DC8C-8855-468C-9E85-912B0DA7387A}.Release|x64.Build.0 = Release|Any CPU
130-
{DE11DC8C-8855-468C-9E85-912B0DA7387A}.Release|x86.ActiveCfg = Release|Any CPU
131-
{DE11DC8C-8855-468C-9E85-912B0DA7387A}.Release|x86.Build.0 = Release|Any CPU
120+
{22B8BBB5-6984-41CE-8B3B-2CC8F325D129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121+
{22B8BBB5-6984-41CE-8B3B-2CC8F325D129}.Debug|Any CPU.Build.0 = Debug|Any CPU
122+
{22B8BBB5-6984-41CE-8B3B-2CC8F325D129}.Debug|x64.ActiveCfg = Debug|Any CPU
123+
{22B8BBB5-6984-41CE-8B3B-2CC8F325D129}.Debug|x64.Build.0 = Debug|Any CPU
124+
{22B8BBB5-6984-41CE-8B3B-2CC8F325D129}.Debug|x86.ActiveCfg = Debug|Any CPU
125+
{22B8BBB5-6984-41CE-8B3B-2CC8F325D129}.Debug|x86.Build.0 = Debug|Any CPU
126+
{22B8BBB5-6984-41CE-8B3B-2CC8F325D129}.Release|Any CPU.ActiveCfg = Release|Any CPU
127+
{22B8BBB5-6984-41CE-8B3B-2CC8F325D129}.Release|Any CPU.Build.0 = Release|Any CPU
128+
{22B8BBB5-6984-41CE-8B3B-2CC8F325D129}.Release|x64.ActiveCfg = Release|Any CPU
129+
{22B8BBB5-6984-41CE-8B3B-2CC8F325D129}.Release|x64.Build.0 = Release|Any CPU
130+
{22B8BBB5-6984-41CE-8B3B-2CC8F325D129}.Release|x86.ActiveCfg = Release|Any CPU
131+
{22B8BBB5-6984-41CE-8B3B-2CC8F325D129}.Release|x86.Build.0 = Release|Any CPU
132132
EndGlobalSection
133133
GlobalSection(SolutionProperties) = preSolution
134134
HideSolutionNode = FALSE
@@ -140,6 +140,6 @@ Global
140140
{A8EF80EB-2E45-4287-BB5E-2435A012B10B} = {883B467C-E170-4A9F-972A-45BD8CE86D96}
141141
{F99C62EC-BA53-4009-A220-5DCB9F88FBF1} = {883B467C-E170-4A9F-972A-45BD8CE86D96}
142142
{4237E87B-DA97-4446-A0CA-F4C663F5FC84} = {883B467C-E170-4A9F-972A-45BD8CE86D96}
143-
{DE11DC8C-8855-468C-9E85-912B0DA7387A} = {FDE7DBBB-20D7-0A02-9AE8-981A0BC85643}
143+
{22B8BBB5-6984-41CE-8B3B-2CC8F325D129} = {FDE7DBBB-20D7-0A02-9AE8-981A0BC85643}
144144
EndGlobalSection
145145
EndGlobal

‎src/DnsResolver/DnsResolver/Az.DnsResolver.psd1‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 2025-11-05
6+
# Generated on: 2025-11-18
77
#
88

99
@{
@@ -57,10 +57,10 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '5.3.1'; })
5757
RequiredAssemblies = 'DnsResolver.Autorest/bin/Az.DnsResolver.private.dll'
5858

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

6262
# Type files (.ps1xml) to be loaded when importing this module
63-
# TypesToProcess = @()
63+
TypesToProcess = @()
6464

6565
# Format files (.ps1xml) to be loaded when importing this module
6666
FormatsToProcess = 'DnsResolver.Autorest/Az.DnsResolver.format.ps1xml'
@@ -129,7 +129,7 @@ PrivateData = @{
129129
PSData = @{
130130

131131
# Tags applied to this module. These help with module discovery in online galleries.
132-
Tags = 'Azure','ResourceManager','ARM','PSModule','DnsResolver'
132+
Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'DnsResolver'
133133

134134
# A URL to the license for this module.
135135
LicenseUri = 'https://aka.ms/azps-license'
@@ -156,7 +156,7 @@ PrivateData = @{
156156

157157
} # End of PSData hashtable
158158

159-
} # End of PrivateData hashtable
159+
} # End of PrivateData hashtable
160160

161161
# HelpInfo URI of this module
162162
# HelpInfoURI = ''

‎tools/AzPreview/ChangeLog.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1742,7 +1742,7 @@
17421742
#### Az.Dns 1.3.1
17431743
* Upgraded nuget package to signed package.
17441744

1745-
#### Az.DnsResolver 1.1.1
1745+
#### Az.DnsResolver 1.3.0
17461746
* Upgraded nuget package to signed package.
17471747

17481748
#### Az.DynatraceObservability 0.1.2

0 commit comments

Comments
 (0)