diff --git a/.github/README.md b/.github/README.md index da201e2..83fa8d0 100644 --- a/.github/README.md +++ b/.github/README.md @@ -3,7 +3,7 @@ [![MIT License](https://img.shields.io/badge/License-MIT-green.svg)](../LICENSE.md) [![PowerShell 3 | 4 | 5](https://img.shields.io/badge/PowerShell-3%20|%204%20|%205-0000FF.svg?logo=PowerShell)](#) [![Windows Server 2008 R2 | 2012 R2 | 2016 | 2019](https://img.shields.io/badge/Windows%20Server-2008%20R2%20|%202012%20R2%20|%202016%20|%202019-007bb8.svg?logo=Windows)](#) -[![.NET Framework 4.5.1+](https://img.shields.io/badge/.NET%20Framework-4.5.1%2B-007FFF.svg)](#) +[![.NET Framework 4.7+](https://img.shields.io/badge/.NET%20Framework-4.7%2B-007FFF.svg)](#) ## Introduction @@ -83,7 +83,7 @@ The easiest way of integrating the DSInternals functionality into .NET applicati ### Building from Source Code -[![Visual Studio 2015 | 2017 | 2019](https://img.shields.io/badge/Visual%20Studio-2015%20|%202017%20|%202019-383278.svg?logo=Visual-Studio-Code)](CONTRIBUTING.md#building-from-source-code) +[![Visual Studio 2017 | 2019](https://img.shields.io/badge/Visual%20Studio-2017%20|%202019-383278.svg?logo=Visual-Studio-Code)](CONTRIBUTING.md#building-from-source-code) [![Build Status](https://dev.azure.com/DSInternals/DSInternals%20CI/_apis/build/status/DSInternals?branchName=master)](https://dev.azure.com/DSInternals/DSInternals%20CI/_build/latest?definitionId=2&branchName=master) [![Test Results](https://img.shields.io/azure-devops/tests/DSInternals/DSInternals%20CI/2.svg?label=Test%20Results&logo=Azure-DevOps)](https://dev.azure.com/DSInternals/DSInternals%20CI/_build/latest?definitionId=2&branchName=master) diff --git a/Src/DSInternals.Common.Test/DSInternals.Common.Test.csproj b/Src/DSInternals.Common.Test/DSInternals.Common.Test.csproj index d0e0a58..6c3016b 100644 --- a/Src/DSInternals.Common.Test/DSInternals.Common.Test.csproj +++ b/Src/DSInternals.Common.Test/DSInternals.Common.Test.csproj @@ -37,12 +37,11 @@ ..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + True ..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - - ..\packages\PeterO.Numbers.1.2.2\lib\net40\Numbers.dll + True @@ -80,7 +79,6 @@ - diff --git a/Src/DSInternals.Common.Test/app.config b/Src/DSInternals.Common.Test/app.config deleted file mode 100644 index a241feb..0000000 --- a/Src/DSInternals.Common.Test/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Src/DSInternals.Common.Test/packages.config b/Src/DSInternals.Common.Test/packages.config index 005b9c3..4a68cce 100644 --- a/Src/DSInternals.Common.Test/packages.config +++ b/Src/DSInternals.Common.Test/packages.config @@ -2,7 +2,4 @@ - - - \ No newline at end of file diff --git a/Src/DSInternals.Common/DSInternals.Common.csproj b/Src/DSInternals.Common/DSInternals.Common.csproj index 20c8fb4..4835f7f 100644 --- a/Src/DSInternals.Common/DSInternals.Common.csproj +++ b/Src/DSInternals.Common/DSInternals.Common.csproj @@ -36,14 +36,14 @@ ..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll - - ..\packages\PeterO.Cbor.3.0.3\lib\netstandard1.0\CBOR.dll + + ..\packages\PeterO.Cbor.3.5.2\lib\net40\CBOR.dll - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\PeterO.Numbers.1.2.2\lib\net40\Numbers.dll + + ..\packages\PeterO.Numbers.1.4.3\lib\net40\Numbers.dll diff --git a/Src/DSInternals.Common/packages.config b/Src/DSInternals.Common/packages.config index 76a4789..a5b43cc 100644 --- a/Src/DSInternals.Common/packages.config +++ b/Src/DSInternals.Common/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/Src/DSInternals.DataStore.Test/DSInternals.DataStore.Test.csproj b/Src/DSInternals.DataStore.Test/DSInternals.DataStore.Test.csproj index 4605214..639d39e 100644 --- a/Src/DSInternals.DataStore.Test/DSInternals.DataStore.Test.csproj +++ b/Src/DSInternals.DataStore.Test/DSInternals.DataStore.Test.csproj @@ -37,9 +37,11 @@ ..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + False ..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + False diff --git a/Src/DSInternals.PowerShell/Chocolatey/dsinternals-psmodule.nuspec b/Src/DSInternals.PowerShell/Chocolatey/dsinternals-psmodule.nuspec index 718b445..09c4801 100644 --- a/Src/DSInternals.PowerShell/Chocolatey/dsinternals-psmodule.nuspec +++ b/Src/DSInternals.PowerShell/Chocolatey/dsinternals-psmodule.nuspec @@ -32,7 +32,6 @@ ## Installation Notes * The module will be installed to the *$PSHome\Modules* directory. This is to avoid conflicts with the *PowerShell Gallery* and still support module autoloading. -* On Windows 7 and Windows Server 2008 R2, PowerShell has to be [upgraded](https://chocolatey.org/packages/PowerShell) first. ## Disclaimer Features exposed through these tools are not supported by Microsoft. Improper use might cause irreversible damage to domain controllers or negatively impact domain security. @@ -42,12 +41,12 @@ Features exposed through these tools are not supported by Microsoft. Improper us * Improved Get-Help documentation. - - + + - - + + diff --git a/Src/DSInternals.PowerShell/DSInternals.PowerShell.csproj b/Src/DSInternals.PowerShell/DSInternals.PowerShell.csproj index 989c614..56d97ef 100644 --- a/Src/DSInternals.PowerShell/DSInternals.PowerShell.csproj +++ b/Src/DSInternals.PowerShell/DSInternals.PowerShell.csproj @@ -120,6 +120,7 @@ {8a857b97-1be0-4bae-a4e8-dee870858bfd} DSInternals.DataStore + False {0bca513c-5f12-48b6-8288-d3a95ec2994a} @@ -138,13 +139,14 @@ - - ..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll + + ..\packages\AutoMapper.8.1.1\lib\net461\AutoMapper.dll ..\packages\Microsoft.PowerShell.3.ReferenceAssemblies.1.0.0\lib\net4\System.Management.Automation.dll + False diff --git a/Src/DSInternals.PowerShell/DSInternals.psd1 b/Src/DSInternals.PowerShell/DSInternals.psd1 index aa8792d..dbd3e0f 100644 --- a/Src/DSInternals.PowerShell/DSInternals.psd1 +++ b/Src/DSInternals.PowerShell/DSInternals.psd1 @@ -33,10 +33,10 @@ DISCLAIMER: Features exposed through this module are not supported by Microsoft PowerShellVersion = '3.0' # Minimum version of Microsoft .NET Framework required by this module -DotNetFrameworkVersion = '4.5.1' # This requirement is not enforced by older versions of PS. +DotNetFrameworkVersion = '4.7' # This requirement is not enforced by older versions of PS. # Minimum version of the common language runtime (CLR) required by this module -CLRVersion = '4.0.30319.18408' # Corresponds to .NET Framework 4.5.1 +CLRVersion = '4.0.30319.42000' # Corresponds to .NET Framework 4.6 and later # Processor architecture (None, X86, Amd64) required by this module ProcessorArchitecture = 'None' @@ -94,6 +94,7 @@ AliasesToExport = 'Set-WinUserPasswordHash', 'Set-ADAccountPasswordHash', FileList = 'AutoMapper.dll', 'BouncyCastle.Crypto.dll', + 'CBOR.dll', 'DSInternals.Common.dll', 'DSInternals.DataStore.dll', 'DSInternals.Replication.dll', @@ -103,6 +104,8 @@ FileList = 'Esent.Isam.dll', 'License.txt', 'NDceRpc.Microsoft.dll', + 'Newtonsoft.Json.dll', + 'Numbers.dll', 'amd64\DSInternals.Replication.Interop.dll', 'x86\DSInternals.Replication.Interop.dll', 'en-US\about_DSInternals.help.txt', diff --git a/Src/DSInternals.PowerShell/packages.config b/Src/DSInternals.PowerShell/packages.config index 2c36f79..30b6e43 100644 --- a/Src/DSInternals.PowerShell/packages.config +++ b/Src/DSInternals.PowerShell/packages.config @@ -1,6 +1,6 @@  - + - + \ No newline at end of file diff --git a/Src/DSInternals.Replication.Model.Test/DSInternals.Replication.Model.Test.csproj b/Src/DSInternals.Replication.Model.Test/DSInternals.Replication.Model.Test.csproj index eab8645..281edf8 100644 --- a/Src/DSInternals.Replication.Model.Test/DSInternals.Replication.Model.Test.csproj +++ b/Src/DSInternals.Replication.Model.Test/DSInternals.Replication.Model.Test.csproj @@ -36,9 +36,11 @@ ..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + False ..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + False diff --git a/Src/DSInternals.Replication.Model/DSInternals.Replication.Model.csproj b/Src/DSInternals.Replication.Model/DSInternals.Replication.Model.csproj index c70f5d3..6352eb5 100644 --- a/Src/DSInternals.Replication.Model/DSInternals.Replication.Model.csproj +++ b/Src/DSInternals.Replication.Model/DSInternals.Replication.Model.csproj @@ -57,8 +57,6 @@ False - -