Skip to content

Commit 5163f64

Browse files
authored
Merge pull request #5164 from Azure/nlogauth
Update CheckSignature Authenticode check to exclude NLog dependency
2 parents d003249 + 1168fb4 commit 5163f64

File tree

4 files changed

+21
-49
lines changed

4 files changed

+21
-49
lines changed

src/ResourceManager/DataLakeStore/AzureRM.DataLakeStore.psd1

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '5.0.0'
15+
ModuleVersion = '5.0.1'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -54,7 +54,7 @@ CLRVersion = '4.0'
5454
RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.1.1'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
57-
RequiredAssemblies = '.\Microsoft.Azure.Management.DataLake.Store.dll'
57+
RequiredAssemblies = '.\Microsoft.Azure.Management.DataLake.Store.dll','.\Microsoft.Azure.DataLake.Store.dll','.\NLog.dll'
5858

5959
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
6060
# ScriptsToProcess = @()
@@ -63,8 +63,7 @@ RequiredAssemblies = '.\Microsoft.Azure.Management.DataLake.Store.dll'
6363
# TypesToProcess = @()
6464

6565
# Format files (.ps1xml) to be loaded when importing this module
66-
FormatsToProcess =
67-
'.\Microsoft.Azure.Commands.DataLakeStoreFileSystem.format.ps1xml'
66+
FormatsToProcess = '.\Microsoft.Azure.Commands.DataLakeStoreFileSystem.format.ps1xml'
6867

6968
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
7069
NestedModules = @('.\Microsoft.Azure.Commands.DataLakeStore.dll')
@@ -152,14 +151,16 @@ PrivateData = @{
152151
# IconUri = ''
153152

154153
# ReleaseNotes of this module
155-
ReleaseNotes = '* NOTE: This is a breaking change release. Please see the migration guide (https://aka.ms/azps-migration-guide) for a full list of breaking changes introduced.
156-
* Removed the Obsolete Properties fields in PSDataLakeStoreAccount.cs and its assoicated files
157-
* Changed one of the two OutputTypes of Get-AzureRmDataLakeStoreAccount
158-
- List\<PSDataLakeStoreAccount> to List\<PSDataLakeStoreAccountBasic>
159-
- The properties of PSDataLakeStoreAccountBasic is a strict subset of the properties of PSDataLakeStoreAccount
160-
- The additional properties that are in PSDataLakeStoreAccount are not returned by the service. Therefore, this change is to reflect this accurately. These additional properties are still in PSDataLakeStoreAccountBasic, but they are tagged as Obsolete.
161-
* Add support for online help
162-
- Run Get-Help with the -Online parameter to open the online help in your default Internet browser'
154+
ReleaseNotes = '
155+
* Export-AzureRmDataLakeStoreItem (https://github.com/Azure/azure-powershell/blob/adls-data-plane/src/ResourceManager/DataLakeStore/documentation/upcoming-breaking-changes.md) - Deprecated parameters PerFileThreadCount, ConcurrentFileCount and introduced parameter Concurrency
156+
* Import-AzureRMDataLakeStoreItem (https://github.com/Azure/azure-powershell/blob/adls-data-plane/src/ResourceManager/DataLakeStore/documentation/upcoming-breaking-changes.md) -Deprecated parametersPerFileThreadCount, ConcurrentFileCount and introduced parameter Concurrency
157+
* Get-AzureRMDataLakeStoreItemContent - Fixed the tail behavior for contents greater than 4MB
158+
* Set-AzureRMDataLakeStoreItemExpiry - Introduced new parameter set SetRelativeExpiry for setting relative expiration time
159+
* Remove-AzureRmDataLakeStoreItem (https://github.com/Azure/azure-powershell/blob/adls-data-plane/src/ResourceManager/DataLakeStore/documentation/upcoming-breaking-changes.md) - Deprecated parameter Clean.
160+
'
161+
162+
# Prerelease string of this module
163+
Prerelease = 'preview'
163164

164165
# External dependent modules of this module
165166
# ExternalModuleDependencies = ''

src/ResourceManager/DataLakeStore/ChangeLog.md

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -19,41 +19,11 @@
1919
-->
2020
## Current Release
2121

22-
* Moved from AutoRest sdk to our version of Dataplane sdk for Azure data lake.
23-
* Refactored following cmdlets to use the new version of SDK:
24-
* Add-AzureRmDataLakeStoreItemContent
25-
* Export-AzureRmDataLakeStoreItem
26-
* Get-AzureRmDataLakeStoreChildItem
27-
* Get-AzureRmDataLakeStoreItem
28-
* Get-AzureRmDataLakeStoreItemAclEntry
29-
* Get-AzureRmDataLakeStoreItemContent
30-
* Get-AzureRmDataLakeStoreItemOwner
31-
* Get-AzureRmDataLakeStoreItemPermission
32-
* Import-AzureRmDataLakeStoreItem
33-
* Join-AzureRmDataLakeStoreItem
34-
* Move-AzureRmDataLakeStoreItem
35-
* New-AzureRmDataLakeStoreItem
36-
* Remove-AzureRmDataLakeStoreItem
37-
* Remove-AzureRmDataLakeStoreItemAcl
38-
* Remove-AzureRmDataLakeStoreItemAclEntry
39-
* Set-AzureRmDataLakeStoreItemAcl
40-
* Set-AzureRmDataLakeStoreItemAclEntry
41-
* Set-AzureRmDataLakeStoreItemExpiry
42-
* Set-AzureRmDataLakeStoreItemOwner
43-
* Set-AzureRmDataLakeStoreItemPermission
44-
* Test-AzureRmDataLakeStoreItem
45-
* Refactored following models to use models from new SDK:
46-
* DataLakeStoreEnums
47-
* DataLakeStoreFileSystemClient
48-
* DataLakeStoreItem
49-
* DataLakeStoreItemAce
50-
* DataLakeStorePathInstance
51-
* Moved the commands and models related to the dataplane into separate folders
52-
* Export-AzureRmDataLakeStoreItem (documented in the breaking changes) - Deprecated parameters PerFileThreadCount, ConcurrentFileCount and introduced parameter Concurrency
53-
* Import-AzureRMDataLakeStoreItem (documented in the breaking changes) -Deprecated parametersPerFileThreadCount, ConcurrentFileCount and introduced parameter Concurrency
22+
* Export-AzureRmDataLakeStoreItem (https://github.com/Azure/azure-powershell/blob/adls-data-plane/src/ResourceManager/DataLakeStore/documentation/upcoming-breaking-changes.md) - Deprecated parameters PerFileThreadCount, ConcurrentFileCount and introduced parameter Concurrency
23+
* Import-AzureRMDataLakeStoreItem (https://github.com/Azure/azure-powershell/blob/adls-data-plane/src/ResourceManager/DataLakeStore/documentation/upcoming-breaking-changes.md) -Deprecated parametersPerFileThreadCount, ConcurrentFileCount and introduced parameter Concurrency
5424
* Get-AzureRMDataLakeStoreItemContent - Fixed the tail behavior for contents greater than 4MB
55-
* Set-AzureRMDataLakeStoreItemExpiry - Introduced new parameter set for setting relative expiration time
56-
* Remove-AzureRmDataLakeStoreItem (documented in the breaking changes) - Deprecated parameter Clean.
25+
* Set-AzureRMDataLakeStoreItemExpiry - Introduced new parameter set SetRelativeExpiry for setting relative expiration time
26+
* Remove-AzureRmDataLakeStoreItem (https://github.com/Azure/azure-powershell/blob/adls-data-plane/src/ResourceManager/DataLakeStore/documentation/upcoming-breaking-changes.md) - Deprecated parameter Clean.
5727

5828
## Version 5.0.0
5929
* NOTE: This is a breaking change release. Please see the migration guide (https://aka.ms/azps-migration-guide) for a full list of breaking changes introduced.

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
// by using the '*' as shown below:
3636

3737

38-
[assembly: AssemblyVersion("5.0.0")]
39-
[assembly: AssemblyFileVersion("5.0.0")]
38+
[assembly: AssemblyVersion("5.0.1")]
39+
[assembly: AssemblyFileVersion("5.0.1")]

tools/CheckSignature.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ function Check-All {
7474
$files = $files | Where-Object { ($_.FullName -notlike "*Newtonsoft.Json*") -and `
7575
($_.FullName -notlike "*AutoMapper*") -and `
7676
($_.FullName -notlike "*Security.Cryptography*") -and `
77+
($_.FullName -notlike "*NLog*") -and `
7778
($_.FullName -notlike "*BouncyCastle.Crypto*")}
7879
Write-Host "Checking the authenticode signature of $($files.Count) files (.dll, .ps1, .psm1)" -ForegroundColor Yellow
7980

@@ -209,4 +210,4 @@ else
209210
Write-Host "No switch parameter set - checking all files in current directory" -ForegroundColor Yellow
210211
}
211212

212-
Check-All $path
213+
Check-All $path

0 commit comments

Comments
 (0)