diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
index 392da9d50f7a..f2b251c6ec66 100644
--- a/.github/policies/resourceManagement.yml
+++ b/.github/policies/resourceManagement.yml
@@ -1762,7 +1762,8 @@ configuration:
then:
- mentionUsers:
mentionees:
- - alec-baird，costinhagiu
+ - alec-baird
+ - costinhagiu
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
assignMentionees: False
- if:
@@ -1984,6 +1985,24 @@ configuration:
- omzevall
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
assignMentionees: False
+ - if:
+ - or:
+ - labelAdded:
+ label: Service Attention
+ - labelAdded:
+ label: ImageBuilder
+ - hasLabel:
+ label: Service Attention
+ - hasLabel:
+ label: ImageBuilder
+ then:
+ - mentionUsers:
+ mentionees:
+ - adana-popescu
+ - KalpeshChavan12
+ - ralucaminea
+ replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+ assignMentionees: False
- if:
- or:
- labelAdded:
@@ -2229,7 +2248,9 @@ configuration:
then:
- mentionUsers:
mentionees:
- - adana-popescu，KalpeshChavan12，ralucaminea
+ - adana-popescu
+ - KalpeshChavan12
+ - ralucaminea
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
assignMentionees: False
- if:
diff --git a/build.proj b/build.proj
index 1b614ca84948..a192adcca31a 100644
--- a/build.proj
+++ b/build.proj
@@ -55,8 +55,8 @@
$(RepoRoot)signed
- $(RepoArtifacts)/TestResults
- $(RepoArtifacts)/StaticAnalysisResults
+ $(RepoArtifacts)TestResults
+ $(RepoArtifacts)StaticAnalysisResults
$(RepoSrc)
@@ -132,13 +132,13 @@
-
+
-
-
+
+
@@ -164,39 +164,32 @@
build
publish
-
-
+
+
-
-
- Microsoft.Powershell.*.dll,System*.dll,Microsoft.VisualBasic.dll,Microsoft.CSharp.dll,Microsoft.CodeAnalysis.dll,Microsoft.CodeAnalysis.CSharp.dll
- System.Security.Cryptography.ProtectedData.dll,System.Configuration.ConfigurationManager.dll,System.Runtime.CompilerServices.Unsafe.dll,System.IO.FileSystem.AccessControl.dll,System.Buffers.dll,System.Text.Encodings.Web.dll,System.CodeDom.dll,System.Management.dll,System.Text.Json.dll,System.Threading.Tasks.Extensions.dll,System.IO.Hashing.dll
-
-
-
+
+
-
-
-
+
@@ -213,14 +206,14 @@
-
+
-
+
@@ -228,20 +221,20 @@
-
+
-
+
-
+
-
+
@@ -251,19 +244,19 @@
-
+
-
+
-
+
-
+
@@ -283,7 +276,7 @@
-
+
@@ -299,25 +292,25 @@
+$(RepoArtifacts)$(Configuration)/**/Microsoft*Azure*PowerShell*Cmdlets*.dll;
+$(RepoArtifacts)$(Configuration)/**/Microsoft.Azure.PowerShell.Authentication.dll;
+$(RepoArtifacts)$(Configuration)/**/Microsoft.Azure.PowerShell.Authentication.ResourceManager.dll;
+$(RepoArtifacts)$(Configuration)/**/Microsoft.Azure.PowerShell.Authenticators.dll" Exclude="$(RepoArtifacts)$(Configuration)/**/Microsoft*Azure*PowerShell*Cmdlets*.Test.dll" />
-
+
-
+
-
-
-
-
+
+
+
+
@@ -328,10 +321,10 @@ $(RepoArtifacts)/$(Configuration)/**/Microsoft.Azure.PowerShell.Authenticators.d
-
+
-
+
diff --git a/tools/BuildScripts/BuildModules.ps1 b/tools/BuildScripts/BuildModules.ps1
index e53fdddc1917..3117ea93158c 100644
--- a/tools/BuildScripts/BuildModules.ps1
+++ b/tools/BuildScripts/BuildModules.ps1
@@ -96,7 +96,7 @@ if ($PSCmdlet.ParameterSetName -eq 'AllSet') {
}
if ($PSCmdlet.ParameterSetName -eq 'ModifiedBuildSet' -or $PSCmdlet.ParameterSetName -eq 'TargetModuleSet') {
- .$RepoRoot\tools\BuildScripts\CheckChangeLogs.ps1 -outputFile $RepoArtifacts/ModifiedModule.txt -rootPath $RepoRoot -TargetModuleList $TargetModule
+ .${RepoRoot}tools/BuildScripts/CheckChangeLogs.ps1 -outputFile $RepoArtifacts/ModifiedModule.txt -rootPath $RepoRoot -TargetModuleList $TargetModule
$ModuleList = Get-Content $RepoArtifacts/ModifiedModule.txt
foreach ($module in $ModuleList) {
$csprojFiles += Add-Project -Path "$RepoRoot/src/$module" -Configuration $Configuration
diff --git a/tools/BuildScripts/CheckChangelogs.ps1 b/tools/BuildScripts/CheckChangeLogs.ps1
similarity index 96%
rename from tools/BuildScripts/CheckChangelogs.ps1
rename to tools/BuildScripts/CheckChangeLogs.ps1
index 541e3b6fdbe1..03c3b71179bc 100644
--- a/tools/BuildScripts/CheckChangelogs.ps1
+++ b/tools/BuildScripts/CheckChangeLogs.ps1
@@ -21,7 +21,7 @@ param(
)
# Read the content of changelog.md into a variable
-$content = Get-Content -Path "$rootPath/tools/Azpreview/changelog.md"
+$content = Get-Content -Path "$rootPath/tools/AzPreview/ChangeLog.md"
$continueReading = $false
$modules = @()
diff --git a/tools/BuildScripts/RemoveUnwantedFiles.ps1 b/tools/BuildScripts/RemoveUnwantedFiles.ps1
new file mode 100644
index 000000000000..614c2fd105a6
--- /dev/null
+++ b/tools/BuildScripts/RemoveUnwantedFiles.ps1
@@ -0,0 +1,77 @@
+# ----------------------------------------------------------------------------------
+# Copyright Microsoft Corporation
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ----------------------------------------------------------------------------------
+
+<##
+# .SYNOPSIS
+# Remove unnecessary files before packaging.
+# .DESCRIPTION
+# This script removes the runtime assemblies because PowerShell already has them, as well as the .deps.json files because they are not needed.
+# .EXAMPLE
+# .\RemoveRuntimeAssemblies.ps1 -RootPath "C:\repo\azure-powershell\artifacts\Debug\"
+# This example removes the runtime assemblies in the Debug folder
+# .EXAMPLE
+# .\RemoveRuntimeAssemblies.ps1 -RootPath "C:\repo\azure-powershell\artifacts\Debug\" -CodeSign
+# This example removes the runtime assemblies and the runtimes folder
+# .NOTES
+# It's unclear whether removing the runtimes folder is still necessary because the folder doesn't seem to exist in the build process.
+#>
+
+param(
+ [CmdletBinding()]
+ [Parameter(Mandatory = $True, HelpMessage = "Root path of the assemblies, e.g. artifacts/Debug/")]
+ [string] $RootPath,
+
+ [Parameter(HelpMessage = "true or false. If true, remove the runtimes folder")]
+ [string] $CodeSign
+)
+
+$RuntimeDllsIncludeList = @(
+ 'Microsoft.Powershell.*.dll',
+ 'System*.dll',
+ 'Microsoft.VisualBasic.dll',
+ 'Microsoft.CSharp.dll',
+ 'Microsoft.CodeAnalysis.dll',
+ 'Microsoft.CodeAnalysis.CSharp.dll'
+)
+$RuntimeDllsExcludeList = @(
+ 'System.Security.Cryptography.ProtectedData.dll',
+ 'System.Configuration.ConfigurationManager.dll',
+ 'System.Runtime.CompilerServices.Unsafe.dll',
+ 'System.IO.FileSystem.AccessControl.dll',
+ 'System.Buffers.dll',
+ 'System.Text.Encodings.Web.dll',
+ 'System.CodeDom.dll',
+ 'System.Management.dll',
+ 'System.Text.Json.dll',
+ 'System.Threading.Tasks.Extensions.dll',
+ 'System.IO.Hashing.dll'
+)
+
+$toRemove = Get-ChildItem -Path $RootPath -Recurse -Include $RuntimeDllsIncludeList -Exclude $RuntimeDllsExcludeList
+ | Where-Object { $_.FullName -notlike '*Accounts*lib*' -and $_.FullName -notlike '*ModuleAlcAssemblies*' }
+Write-Host "Removing $($toRemove.Count) runtime assemblies."
+$toRemove | Remove-Item -Force
+Write-Host "runtime assemblies removed."
+
+if ($CodeSign -eq 'true') {
+ $toRemove = Get-ChildItem -Path $RootPath -Recurse -Include 'runtimes'
+ Write-Host "Removing $($toRemove.Count) 'runtimes' folders."
+ $toRemove | Remove-Item -Recurse -Force
+ Write-Host "'runtimes' folders removed."
+}
+
+$toRemove = Get-ChildItem -Path $RootPath -Recurse
+ | Where-Object { $_.Name -Like '*Az.*.deps.json' -or $_.Name -Like 'Microsoft.Azure.*.deps.json' }
+Write-Host "Removing $($toRemove.Count) .deps.json files."
+$toRemove | Remove-Item -Force
+Write-Host ".deps.json files removed."