Skip to content

Commit

Permalink
Merge pull request #41 from microsoft/main
Browse files Browse the repository at this point in the history
2021 03 01 Release
  • Loading branch information
bill-long authored Mar 1, 2021
2 parents dd55c1e + 927e9fd commit bc34866
Show file tree
Hide file tree
Showing 8 changed files with 86 additions and 2 deletions.
14 changes: 13 additions & 1 deletion .build/Build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ New-Item -Path $distFolder -ItemType Directory | Out-Null
File names must be unique across the repo since we release in a flat structure.
#>

$scriptFiles = Get-ChildItem -Path $repoRoot -Directory | Where-Object { $_.Name -ne ".build" } | ForEach-Object { Get-ChildItem -Path $_.FullName *.ps1 -Recurse } | ForEach-Object { $_.FullName }
$scriptFiles = Get-ChildItem -Path $repoRoot -Directory |
Where-Object { $_.Name -ne ".build" } |
ForEach-Object { Get-ChildItem -Path $_.FullName *.ps1 -Recurse } |
Sort-Object Name |
ForEach-Object { $_.FullName }

$nonUnique = @($scriptFiles | ForEach-Object { [IO.Path]::GetFileName($_) } | Group-Object | Where-Object { $_.Count -gt 1 })
if ($nonUnique.Count -gt 0) {
Expand Down Expand Up @@ -54,6 +58,12 @@ $scriptFiles = $scriptFiles | Where-Object {

$disclaimer = [IO.File]::ReadAllLines("$repoRoot\.build\disclaimer.txt")

$versionFile = "$distFolder\ScriptVersions.txt"
New-Item -Path $versionFile -ItemType File | Out-Null
"# Script Versions" | Out-File $versionFile -Append
"Script | Version" | Out-File $versionFile -Append
"-------|--------" | Out-File $versionFile -Append

$scriptFiles | ForEach-Object {
$scriptContent = New-Object 'System.Collections.Generic.List[string]'
$scriptContent.AddRange([IO.File]::ReadAllLines($_))
Expand Down Expand Up @@ -115,5 +125,7 @@ $scriptFiles | ForEach-Object {
$scriptContent.Insert(0, "")
$scriptContent.InsertRange(0, $disclaimer)

"$([IO.Path]::GetFileName($_)) | v$($commitTime.ToString("yy.MM.dd.HHmm"))" | Out-File $versionFile -Append

Set-Content -Path ([IO.Path]::Combine($distFolder, [IO.Path]::GetFileName($_))) -Value $scriptContent
}
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/check-setting-or-config-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: New Feature or Tool
about: If you have a new feature or tool request
title: ''
labels: ''
assignees: ''

---

**Is your request related to a problem? Please describe.**
A clear and concise description of what the problem is and the results it had on the environment.

**Describe The Request**
A clear and concise description of the feature to add to a current tool or a new tool with what we all want to be checking with examples.

**Additional context**
Add any other context or screenshots about the feature request here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/issue-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Issue Report
about: Create a report to help us improve
title: "[Issue]"
labels: Issue
assignees: ''

---

**Describe the issue**
A clear and concise description of what the issue is, including what script you are seeing the error in.

**Expected behavior**
A clear and concise description of what you expected to happen.

**Script Output**
If applicable, add the exception that you are seeing that wasn't handled.

**Additional context**
Add any other context about the problem here.
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/work-item.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: Work Item
about: Work that needs to be done within the project
title: "[Work Item]"
labels: Work Item
assignees: ''

---

**Describe the work**
Provide details of the work that needs to be done within the project

**Additional Context**
Any other context here.
11 changes: 11 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
**Issue:**
Describe what the issue is you are addressing

**Reason:**
Describe what the reason is for making the change

**Fix:**
Short description of the fix

**Validation:**
Provide if applicable
1 change: 1 addition & 0 deletions ExTRA/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
EnabledTraces.config
5 changes: 4 additions & 1 deletion PublicFolders/ValidateMailEnabledPublicFolders.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,10 @@ for ($i = 0; $i -lt $ipmSubtreeMailEnabled.Count; $i++) {
if ($null -eq $result) {
$mailEnabledFoldersWithNoADObject += $ipmSubtreeMailEnabled[$i]
} else {
$mailPublicFoldersLinked.TryAdd($result.Guid.ToString(), $result) | Out-Null
$guidString = $result.Guid.ToString()
if (-not $mailPublicFoldersLinked.ContainsKey($guidString)) {
$mailPublicFoldersLinked.Add($guidString, $result) | Out-Null
}
}
}

Expand Down
6 changes: 6 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ steps:
.\Build.ps1
displayName: "Build Script"

- pwsh: |
Get-Content dist\ScriptVersions.txt
displayName: "Display Script Versions file"

- pwsh: |
$tag = "v$((Get-Date).ToString(`"yy.MM.dd.HHmm`"))"
Write-Host "##vso[task.setvariable variable=ReleaseTagValue]$tag"
Expand Down Expand Up @@ -77,5 +81,7 @@ steps:
tagPattern: 'v[0-9].[0-9].[0-9].[0-9]'
tag: $(ReleaseTagValue)
title: $(ReleaseTagValue)
releaseNotesSource: 'file'
releaseNotesFile: dist\ScriptVersions.txt
assets: dist\*.ps1
addChangeLog: true

0 comments on commit bc34866

Please sign in to comment.