diff --git a/Directory.Build.targets b/Directory.Build.targets index e398374bb68d5..d6d0f9391b6fb 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,34 +1,3 @@  - - - - - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/README.md b/README.md index 4030243f50076..59d9f288ac4cd 100644 --- a/README.md +++ b/README.md @@ -5,40 +5,52 @@ that take advantage of scalable cloud computing resources. ### Target Frameworks: -* .NET Framework 4.5 -* Netstandard 1.5, based on the NetCore framework +* .NET Framework 4.5.2 +* Netstandard 1.4, based on the NetCore framework ### Prerequisites: - Install .Net CoreCLR Preview 2 using [these steps](https://download.microsoft.com/download/A/3/8/A38489F3-9777-41DD-83F8-2CBDFAB2520C/DotNetCore.1.0.0-VS2015Tools.Preview2.exe). + Install VS 2017 (Professional or higher) + VS2017 Update 1 + (https://www.visualstudio.com/). + To know more about VS 2017 and it's project system (https://docs.microsoft.com/en-us/visualstudio/#pivot=workloads&panel=windows) + +###Directory Restructure +Directory structure has been simplified and consolidated in fewer directories +All Management and Data plane SDKs are now under +src\SDKs +e.g. +src\SDKs\AnalysisService +src\SDKs\Compute ### To build: ####Full Build - 1. Navigate to repository root directory - 2. Invoke **msbuild** build.proj + 1. Open VS 2017 command prompt + 2. Navigate to repository root directory + 3. Invoke **msbuild** build.proj /t:FullBuild + FullBuild will Build, RunTests, Package + Local Published nugets can be found under < root >\PublishedNugets + TestResult can be found under < root >\TestResults +##### *Full Build* without any scope will build all SDK's run all tests. ####Build one nuget package +In order to build one package and run it's test - 1. **msbuild** build.proj /t:build;package /p:scope=ResourceManagement\Compute - + > msbuild build.proj /t:FullBuild /p:scope=SDKs\Compute /p:NugetPackageName=Microsoft.Azure.Management.Compute ####Using Visual Studio: - - - - 1. Open any solution, say, "src\ResourceManagement\Compute\Compute.sln" + 1. Open any solution, say, "SDKs\Compute\Compute.sln" 2. Invoke "build" command. - ### To run the tests: - Using Visual Studio: - - Build. - - "Test Explorer" window will get populated with tests. Go select and invoke. + - "Test Explorer" window will get populated with tests. Select test and Run/Debug. Using the command line: +msbuild .\build.proj /t:"Build;Runtests" /p:Scope=SDKs\Compute +or +dotnet test SDKs\Compute\Compute.Tests\Compute.Tests.csproj - Refer to the "To build" section to get the command window set up. - Invoke "Test" target from "Build.proj". Likely, you need to build test project first, so put in "build" target as well. @@ -48,17 +60,19 @@ Using the command line: ### Project Structure -In "src\ResourceManagement", you will find projects for services that have already been implemented +In "SDKs\< RPName >", you will find projects for services that have already been implemented + - Each SDK project needs to target .NET 4.5.2 and .NET Standard 1.4 + - Test project needs to target NetCoreApp 1.1 - Each service contains a project for their generated/customized code - The folder 'Generated' contains the generated code - The folder 'Customizations' contains additions to the generated code - this can include additions to the generated partial classes, or additional classes that augment the SDK or call the generated code - The file 'generate.cmd', used to generate library code for the given service, can also be found in this project - Services also contain a project for their tests -### Branches: AutoRest vs. master +### Branches: vs17Dev vs. master -The **AutoRest** branch contains the code generated from AutoRest tool. +The **vs17Dev** branch contains the code generated from AutoRest tool. The **master** branch contains the code generated from Hydra/Hyak. - Hydra/Hyak is Azure's legacy code generation technology. @@ -116,10 +130,10 @@ Once all of the above steps are met, the following process will be followed: ### Adding Tests -Regarding the test project, one thing that's important is to name the test project by adding a ".Tests" suffix to the folder name for the folder containing your project. For example, the test project for "Compute\Microsoft.Azure.Management.Compute" should be named 'Compute.Tests' +Regarding the test project, one thing that's important is to name the test project by adding a ".Tests" suffix to the folder name for the folder containing your project. For example, the test project for "Compute\Management.Compute" should be named 'Compute.Tests' - This is for improving CI performance so to find exactly one copy of your test assembly. - - Also, due to test dependencies, the test project should build both .NET 4.5 and NETStandard 1.5. For example, check out "src\ResourceManagement\Resource\Resource.tests" + - Also, due to test dependencies, the test project should build both .NET 4.5.2 and NETStandard 1.4. For example, check out "src\SDKs\Resource\Resource.tests" ### Issues with Generated Code diff --git a/build.proj b/build.proj index 80b53ee983470..306085e782983 100644 --- a/build.proj +++ b/build.proj @@ -1,13 +1,13 @@ - - + - + - + + diff --git a/src/SDKs/Billing/Management.Billing/Microsoft.Azure.Management.Billing.csproj b/src/SDKs/Billing/Management.Billing/Microsoft.Azure.Management.Billing.csproj index ff81080f16db4..cd77b18065536 100644 --- a/src/SDKs/Billing/Management.Billing/Microsoft.Azure.Management.Billing.csproj +++ b/src/SDKs/Billing/Management.Billing/Microsoft.Azure.Management.Billing.csproj @@ -1,34 +1,12 @@  - - + Microsoft Azure Billing Management Library 1.1.0-preview Microsoft - Microsoft.Azure.Management.Billing - Microsoft.Azure.Management.Billing Microsoft Azure Billing management;Billing;Billing management;REST HTTP client;windowsazureofficial;netcore451511 - http://go.microsoft.com/fwlink/?LinkID=288890 - https://github.com/Azure/azure-sdk-for-net - https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE - true - $(PackageTargetFallback);dnxcore50 - 1.6.1 - $(PackageTargetFallback);dnxcore50 - 1.6.1 - false - false - false - false - false - false - false - false - false net452;netstandard1.4 @@ -45,34 +23,5 @@ - - - + diff --git a/src/SDKs/KeyVault/NuGet.Config b/src/SDKs/KeyVault/NuGet.Config deleted file mode 100644 index 7fb9fe02b3f58..0000000000000 --- a/src/SDKs/KeyVault/NuGet.Config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Core/Microsoft.Azure.KeyVault.Core.csproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Core/Microsoft.Azure.KeyVault.Core.csproj new file mode 100644 index 0000000000000..a4eb3377fdf0d --- /dev/null +++ b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Core/Microsoft.Azure.KeyVault.Core.csproj @@ -0,0 +1,36 @@ + + + + Microsoft.Azure.KeyVault.Core + Microsoft Azure Key Vault Core Class Library + Microsoft Azure Key Vault Core + Microsoft.Azure.KeyVault.Core + 2.0.4 + Microsoft Azure key vault core + + + net452;netstandard1.4 + + + \ No newline at end of file diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Core/Microsoft.Azure.KeyVault.Core.xproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Core/Microsoft.Azure.KeyVault.Core.xproj deleted file mode 100644 index 8e40381e41ecc..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Core/Microsoft.Azure.KeyVault.Core.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - be53cf33-9a3d-4101-9dfd-62ac09cadada - Microsoft.Azure.KeyVault.Core - .\obj - .\bin\ - - - 2.0 - - - True - - - \ No newline at end of file diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Core/project.json b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Core/project.json deleted file mode 100644 index 314ddd0edfb27..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Core/project.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "version": "2.0.4", - "title": "Microsoft Azure Key Vault Core", - "description": "Microsoft Azure Key Vault Core Class Library", - "authors": [ "Microsoft" ], - - "packOptions": { - "summary": "Microsoft Azure Key Vault Core Class Library", - "projectUrl": "https://github.com/Azure/azure-sdk-for-net", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "tags": [ "Microsoft Azure key vault core" ], - "requireLicenseAcceptance": true, - "releaseNotes": "This is a preview release of the Azure Key Vault Core .NET SDK." - }, - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../../tools/MSSharedLibKey.snk", - "xmlDoc": true - }, - - "dependencies": { - }, - - "frameworks": { - "net45": { - "buildOptions": { - "debugType": "portable", - "define": [ "NET45" ] - }, - "frameworkAssemblies": { - }, - "dependencies": { - } - }, - "netstandard1.5": { - "buildOptions": { - "debugType": "portable", - "define": [ "NETSTANDARD", "NETSTANDARD15" ] - }, - "dependencies": { - "System.Runtime": "4.1.0", - "System.Threading.Tasks": "4.0.11" - } - } - } -} \ No newline at end of file diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography.Tests/Microsoft.Azure.KeyVault.Cryptography.Tests.csproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography.Tests/Microsoft.Azure.KeyVault.Cryptography.Tests.csproj new file mode 100644 index 0000000000000..bd4f538c08f02 --- /dev/null +++ b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography.Tests/Microsoft.Azure.KeyVault.Cryptography.Tests.csproj @@ -0,0 +1,55 @@ + + + + Microsoft.Azure.KeyVault.Cryptography.Tests + Microsoft Azure Key Vault Cryptography tests + Microsoft Azure Key Vault Cryptography tests + Microsoft.Azure.KeyVault.Cryptography.Tests + 2.0.2 + + + netcoreapp1.1 + + + + PreserveNewest + + + + + + + + + + + + + + + + + $(DefineConstants);NETSTANDARD;NETCOREAPP11 + portable + + + + $(DefineConstants);NET45;NET451 + + + + + + + + + + + + diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography.Tests/Microsoft.Azure.KeyVault.Cryptography.Tests.xproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography.Tests/Microsoft.Azure.KeyVault.Cryptography.Tests.xproj deleted file mode 100644 index c6447f20da1af..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography.Tests/Microsoft.Azure.KeyVault.Cryptography.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - E01674C0-B8D7-4598-971C-48B0180E273F - Microsoft.Azure.KeyVault.Cryptography.Tests - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography.Tests/project.json b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography.Tests/project.json deleted file mode 100644 index 311650ee6492b..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography.Tests/project.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": "2.0.2", - "title": "Microsoft Azure Key Vault Cryptography tests", - "description": "Microsoft Azure Key Vault Cryptography tests", - "authors": [ "Microsoft Corporation" ], - - "buildOptions": { - "copyToOutput": "appsettings.json", - "delaySign": true, - "publicSign": false, - "keyFile": "../../../tools/MSSharedLibKey.snk" - }, - - "testRunner": "xunit", - - "frameworks": { - "netcoreapp1.0": { - "buildOptions": { - "define": [ "NETSTANDARD", "NETCOREAPP10" ], - "debugType": "portable" - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "System.Security.Cryptography.Algorithms": "4.2.0", - "System.Security.Cryptography.Primitives": "4.0.0" - } - }, - "net451": { - "buildOptions": { - "debugType": "portable", - "define": [ "NET45", "NET451" ] - }, - "frameworkAssemblies": { - }, - "dependencies": { - } - } - }, - - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Microsoft.Azure.KeyVault.Core": "[2.0.4, 3.0)", - "Microsoft.Azure.KeyVault.Cryptography": "[2.0.5, 3.0)", - "Microsoft.Azure.KeyVault.WebKey": "[2.0.4, 3.0)", - "xunit": "2.2.0-beta2-build3300" - } -} diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography/Microsoft.Azure.KeyVault.Cryptography.csproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography/Microsoft.Azure.KeyVault.Cryptography.csproj new file mode 100644 index 0000000000000..5d533da661329 --- /dev/null +++ b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography/Microsoft.Azure.KeyVault.Cryptography.csproj @@ -0,0 +1,45 @@ + + + + Microsoft.Azure.KeyVault.Cryptography + Microsoft Azure Key Vault Cryptography Class Library + Microsoft Azure Key Vault Cryptography + 2.0.5 + Microsoft.Azure.KeyVault.Cryptography + Microsoft Azure key vault cryptography + + + net452;netstandard1.4 + + + + + + + + + + + + + $(DefineConstants);NET45 + portable + + + + $(DefineConstants);NETSTANDARD;NETSTANDARD14 + + + + + + + + + + + + diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography/Microsoft.Azure.KeyVault.Cryptography.xproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography/Microsoft.Azure.KeyVault.Cryptography.xproj deleted file mode 100644 index 9559c842497c5..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography/Microsoft.Azure.KeyVault.Cryptography.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 9021f320-de06-433b-adbc-25a5bc0aa43b - Microsoft.Azure.KeyVault.Cryptography - .\obj - .\bin\ - - - 2.0 - - - True - - - diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography/project.json b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography/project.json deleted file mode 100644 index 920f3ff36483d..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Cryptography/project.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": "2.0.5", - "title": "Microsoft Azure Key Vault Cryptography", - "description": "Microsoft Azure Key Vault Cryptography Class Library", - "authors": [ "Microsoft" ], - - "packOptions": { - "summary": "Class library for Azure Key Vault Cryptography.", - "projectUrl": "https://github.com/Azure/azure-sdk-for-net", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "tags": [ "Microsoft Azure key vault cryptography" ], - "requireLicenseAcceptance": true, - "releaseNotes": "This is a preview release of the Azure Key Vault Cryptography .NET SDK" - }, - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../../tools/MSSharedLibKey.snk", - "xmlDoc": true - }, - - "dependencies": { - "Microsoft.Azure.KeyVault.Core": "[2.0.4, 3.0)" - }, - - "frameworks": { - "net45": { - "buildOptions": { - "define": [ "NET45" ], - "debugType": "portable" - }, - "frameworkAssemblies": { - } - }, - "netstandard1.5": { - "buildOptions": { - "define": [ "NETSTANDARD", "NETSTANDARD15" ], - "debugType": "portable" - }, - "dependencies": { - "System.Diagnostics.Tools": "4.0.1", - "System.Linq": "4.1.0", - "System.Globalization": "4.0.11", - "System.Runtime.Extensions": "4.1.0", - "System.Security.Cryptography.Primitives": "4.0.0", - "System.Security.Cryptography.Algorithms": "4.2.0" - } - } - } -} \ No newline at end of file diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions.Tests/Microsoft.Azure.KeyVault.Extensions.Tests.csproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions.Tests/Microsoft.Azure.KeyVault.Extensions.Tests.csproj new file mode 100644 index 0000000000000..9532fa1ac1078 --- /dev/null +++ b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions.Tests/Microsoft.Azure.KeyVault.Extensions.Tests.csproj @@ -0,0 +1,55 @@ + + + + Microsoft.Azure.KeyVault.Extensions.Tests + Microsoft Azure Key Vault Extensions tests + 2.0.2 + Microsoft.Azure.KeyVault.Extensions.Tests + + + netcoreapp1.1 + + + + PreserveNewest + + + + + + + + + + + + + PreserveNewest + + + + + + + + + + + + + + $(DefineConstants);NETSTANDARD;NETCOREAPP11 + portable + + + + + + + + + + + + + diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions.Tests/Microsoft.Azure.KeyVault.Extensions.Tests.xproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions.Tests/Microsoft.Azure.KeyVault.Extensions.Tests.xproj deleted file mode 100644 index a23bc0c1208af..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions.Tests/Microsoft.Azure.KeyVault.Extensions.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - E01674C0-B8D7-4598-971C-48B0180E274A - Microsoft.Azure.KeyVault.Extensions.Tests - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions.Tests/Tests/CachingKeyResolverTests.cs b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions.Tests/Tests/CachingKeyResolverTests.cs index e73515219f476..34871ec4f40fb 100644 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions.Tests/Tests/CachingKeyResolverTests.cs +++ b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions.Tests/Tests/CachingKeyResolverTests.cs @@ -71,7 +71,7 @@ public async Task KeyVault_CachingKeyResolverThrows() { // Throws mockedResolver.Setup(r => r.ResolveKeyAsync(KeyId, ct)) - .Throws(new EmptyException()); + .Throws(new EmptyException(null)); try { await resolver.ResolveKeyAsync(KeyId, ct); diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions.Tests/project.json b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions.Tests/project.json deleted file mode 100644 index 20fe30e24e38d..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions.Tests/project.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "version": "2.0.2", - "description": "Microsoft Azure Key Vault Extensions tests", - "authors": [ "Microsoft Corporation" ], - - "buildOptions": { - "copyToOutput": "appsettings.json", - "delaySign": true, - "publicSign": false, - "keyFile": "../../../tools/MSSharedLibKey.snk" - }, - - "testRunner": "xunit", - - "frameworks": { - "netcoreapp1.0": { - "buildOptions": { - "debugType": "portable", - "define": [ "NETSTANDARD", "NETCOREAPP10" ] - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "System.Security.Cryptography.Primitives": "4.0.0", - "System.Diagnostics.TraceSource": "4.0.0", - "System.Security.Cryptography.Algorithms": "4.2.0" - }, - "frameworkAssemblies": { - }, - "imports": [ "portable-net45+win8" ] - } - }, - - "dependencies": { - "Microsoft.Azure.KeyVault": "[2.1.0-preview, 3.0)", - "Microsoft.Azure.KeyVault.Cryptography": "[2.0.5, 3.0)", - "Microsoft.Azure.KeyVault.Extensions": "[2.0.5, 3.0)", - "Microsoft.Azure.KeyVault.Core": "[2.0.4, 3.0)", - "Microsoft.Rest.ClientRuntime.Azure.TestFramework": "[1.3.5-preview, 2.0.0)", - "Microsoft.Azure.KeyVault.TestFramework": "[2.0.2-preview, 3.0)", - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Moq": "4.6.38-alpha", - "xunit": "2.2.0-beta2-build3300", - "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.13.5" - } -} diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions/Microsoft.Azure.KeyVault.Extensions.csproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions/Microsoft.Azure.KeyVault.Extensions.csproj new file mode 100644 index 0000000000000..de3a1ef1c3b1b --- /dev/null +++ b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions/Microsoft.Azure.KeyVault.Extensions.csproj @@ -0,0 +1,36 @@ + + + + Microsoft.Azure.KeyVault.Extensions + Microsoft Azure Key Vault Extensions Class Library + Microsoft Azure Key Vault Extensions + Microsoft.Azure.KeyVault.Extensions + 2.0.5 + + + net452;netstandard1.4 + + + + + + + + + + + $(DefineConstants);NETSTANDARD;NETSTANDARD15 + portable + + + + + $(DefineConstants);NET45 + + + + + + + + diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions/Microsoft.Azure.KeyVault.Extensions.xproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions/Microsoft.Azure.KeyVault.Extensions.xproj deleted file mode 100644 index 2fac8d093e7d0..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions/Microsoft.Azure.KeyVault.Extensions.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 9021f320-de06-433b-adbc-25a5bc0aa43c - Microsoft.Azure.KeyVault.Extensions - .\obj - .\bin\ - - - 2.0 - - - True - - - diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions/project.json b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions/project.json deleted file mode 100644 index cae0c9e7467f5..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Extensions/project.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "version": "2.0.5", - "title": "Microsoft Azure Key Vault Extensions", - "description": "Microsoft Azure Key Vault Extensions Class Library", - "authors": [ "Microsoft" ], - - "packOptions": { - "summary": "Class library for Azure Key Vault Extensions", - "projectUrl": "https://github.com/Azure/azure-sdk-for-net", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "tags": [ "Microsoft Azure key vault extensions" ], - "requireLicenseAcceptance": true, - "releaseNotes": "" - }, - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../../tools/MSSharedLibKey.snk", - "xmlDoc": true - }, - - "dependencies": { - "Microsoft.Azure.KeyVault": "[2.1.0-preview, 3.0)", - "Microsoft.Azure.KeyVault.Core": "[2.0.4, 3.0)", - "Microsoft.Azure.KeyVault.Cryptography": "[2.0.5, 3.0)", - "Microsoft.Azure.KeyVault.WebKey": "[2.0.4, 3.0)" - }, - - "frameworks": { - "netstandard1.5": { - "buildOptions": { - "debugType": "portable", - "define": [ "NETSTANDARD", "NETSTANDARD15" ] - }, - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1" - } - }, - "net45": { - "buildOptions": { - "debugType": "portable", - "define": [ "NET45" ] - }, - "frameworkAssemblies": { - }, - "dependencies": { - } - } - }, - "configurations": { - } -} diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.TestFramework/Microsoft.Azure.KeyVault.TestFramework.csproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.TestFramework/Microsoft.Azure.KeyVault.TestFramework.csproj new file mode 100644 index 0000000000000..d8841c3f8ae0f --- /dev/null +++ b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.TestFramework/Microsoft.Azure.KeyVault.TestFramework.csproj @@ -0,0 +1,42 @@ + + + + Microsoft Azure Key Vault Test Framework + Microsoft Azure Key Vault Test Framework + Microsoft.Azure.KeyVault.TestFramework + 2.0.2-preview + + + netcoreapp1.1 + + + + + + + + + + + + + + + + + diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.TestFramework/Microsoft.Azure.KeyVault.TestFramework.xproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.TestFramework/Microsoft.Azure.KeyVault.TestFramework.xproj deleted file mode 100644 index 37c41ff54c43f..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.TestFramework/Microsoft.Azure.KeyVault.TestFramework.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 6F5823CD-D1D7-4DF4-BE61-F07FD8134433 - Microsoft.Azure.KeyVault.TestFramework - .\obj - .\bin\ - - - 2.0 - - - True - - - \ No newline at end of file diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.TestFramework/project.json b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.TestFramework/project.json deleted file mode 100644 index 12a0854ac59f6..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.TestFramework/project.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "version": "2.0.2-preview", - "title": "Microsoft Azure Key Vault Test Framework", - "description": "Microsoft Azure Key Vault Test Framework", - "authors": [ "Microsoft" ], - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../../tools/MSSharedLibKey.snk", - "xmlDoc": true - }, - - "dependencies": { - "Microsoft.Rest.ClientRuntime": "[2.3.3, 3.0)", - "Microsoft.Rest.ClientRuntime.Azure": "[3.3.1, 4.0)", - "Microsoft.Azure.Graph.RBAC": "2.2.2-preview", - "Microsoft.Azure.KeyVault": "[2.1.0-preview, 3.0)", - "Microsoft.Azure.Management.ResourceManager": "1.1.4-preview", - "Microsoft.Rest.ClientRuntime.Azure.TestFramework": "[1.3.5-preview, 2.0.0)", - "Microsoft.Extensions.Configuration": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0" - }, - - "frameworks": { - "netstandard1.5": { - "buildOptions": { - "debugType": "portable", - "define": [ "NETSTANDARD", "NETSTANDARD15" ] - }, - "dependencies": { - }, - "frameworkAssemblies": { - }, - "imports": [ "portable-net45+win8" ] - }, - "net451": { - "buildOptions": { - "debugType": "portable", - "define": [ "NET45", "NET451" ] - }, - "dependencies": { - }, - "frameworkAssemblies": { - }, - "imports": [ ] - } - } -} diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Tests/Microsoft.Azure.KeyVault.Tests.csproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Tests/Microsoft.Azure.KeyVault.Tests.csproj new file mode 100644 index 0000000000000..fead324c4f652 --- /dev/null +++ b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Tests/Microsoft.Azure.KeyVault.Tests.csproj @@ -0,0 +1,47 @@ + + + + Microsoft.Azure.KeyVault.Tests + Microsoft.Azure.KeyVault.Tests Class Library + 2.0.2 + Microsoft.Azure.KeyVault.Tests + + + netcoreapp1.1 + + + + + PreserveNewest + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Tests/Microsoft.Azure.KeyVault.Tests.xproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Tests/Microsoft.Azure.KeyVault.Tests.xproj deleted file mode 100644 index 3e6a416c5188a..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Tests/Microsoft.Azure.KeyVault.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 6F5823CD-D1D7-4DF4-BE61-F07FD8134400 - Microsoft.Azure.KeyVault.Tests - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Tests/project.json b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Tests/project.json deleted file mode 100644 index d9618cc0bc053..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.Tests/project.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "version": "2.0.2", - "description": "Microsoft.Azure.KeyVault.Tests Class Library", - "authors": [ "Microsoft Corporation" ], - - "buildOptions": { - "copyToOutput": "appsettings.json", - "delaySign": true, - "publicSign": false, - "keyFile": "../../../tools/MSSharedLibKey.snk", - "compile": "../../../tools/DisableTestRunParallel.cs" - }, - - "testRunner": "xunit", - - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Microsoft.Azure.KeyVault": "[2.1.0-preview, 3.0)", - "Microsoft.AspNet.WebApi.Client": "5.2.2", - "Microsoft.Azure.KeyVault.TestFramework": "[2.0.2-preview, 3.0)", - "xunit": "2.2.0-beta2-build3300" - }, - - "frameworks": { - "netcoreapp1.0": { - "buildOptions": { - "debugType": "portable", - "define": [ "NETSTANDARD", "NETCOREAPP10" ] - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.13.5" - }, - "frameworkAssemblies": { - }, - "imports": [ "portable-net45+win8" ] - } - } -} \ No newline at end of file diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey.Tests/Microsoft.Azure.KeyVault.WebKey.Tests.csproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey.Tests/Microsoft.Azure.KeyVault.WebKey.Tests.csproj new file mode 100644 index 0000000000000..4560090b67c8e --- /dev/null +++ b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey.Tests/Microsoft.Azure.KeyVault.WebKey.Tests.csproj @@ -0,0 +1,30 @@ + + + + Microsoft.Azure.KeyVault.WebKey.Tests + Microsoft.Azure.KeyVault.WebKey.Tests Class Library + 2.0.2 + Microsoft.Azure.KeyVault.WebKey.Tests + + + net452;netcoreapp1.1 + + + + + + + + $(DefineConstants);NETCOREAPP11 + portable + + + + + $(DefineConstants);NET452 + + + + + + diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey.Tests/Microsoft.Azure.KeyVault.WebKey.Tests.xproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey.Tests/Microsoft.Azure.KeyVault.WebKey.Tests.xproj deleted file mode 100644 index 5802fc1982585..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey.Tests/Microsoft.Azure.KeyVault.WebKey.Tests.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 6F5823CD-D1D7-4DF4-BE61-F07FD813440a - Microsoft.Azure.KeyVault.WebKey.Tests - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey.Tests/WebKeyRsaValidationTest.cs b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey.Tests/WebKeyRsaValidationTest.cs index 25a90eb7d2aca..29e8d8d9d7d83 100644 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey.Tests/WebKeyRsaValidationTest.cs +++ b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey.Tests/WebKeyRsaValidationTest.cs @@ -27,7 +27,7 @@ private static byte[] Decrypt( RSA key, byte[] cipherText ) { byte[] plainText = null; -#if NET451 +#if NET452 if ( key is RSACryptoServiceProvider ) { plainText = ( ( RSACryptoServiceProvider )key ).Decrypt( cipherText, true ); @@ -36,13 +36,13 @@ private static byte[] Decrypt( RSA key, byte[] cipherText ) { throw new CryptographicException( string.Format( "{0} is not supported", key.GetType().FullName ) ); } -#elif NETCOREAPP10 +#elif NETCOREAPP11 plainText = key.Decrypt(cipherText, RSAEncryptionPadding.OaepSHA1); #else - #error Unknown Build Flavor +#error Unknown Build Flavor #endif - - return plainText; + + return plainText; } /// @@ -52,7 +52,7 @@ private static byte[] Encrypt( RSA key ) { byte[] cipherText = null; -#if NET451 +#if NET452 if ( key is RSACryptoServiceProvider ) { cipherText = ( ( RSACryptoServiceProvider )key ).Encrypt( _plainText, true ); @@ -61,7 +61,7 @@ private static byte[] Encrypt( RSA key ) { throw new CryptographicException( string.Format( "{0} is not supported", key.GetType().FullName ) ); } -#elif NETCOREAPP10 +#elif NETCOREAPP11 cipherText = key.Encrypt( _plainText, RSAEncryptionPadding.OaepSHA1 ); #else #error Unknown Build Flavor diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey.Tests/project.json b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey.Tests/project.json deleted file mode 100644 index 19279eea68af2..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey.Tests/project.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "version": "2.0.2", - "description": "Microsoft.Azure.KeyVault.WebKey.Tests Class Library", - "authors": [ "Microsoft Corporation" ], - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../../tools/MSSharedLibKey.snk", - "compile": "../../../tools/DisableTestRunParallel.cs" - }, - - "testRunner": "xunit", - - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Microsoft.Azure.KeyVault.WebKey": "[2.0.4, 3.0)", - "xunit": "2.2.0-beta2-build3300" - }, - - "frameworks": { - "netcoreapp1.0": { - "buildOptions": { - "define": [ "NETCOREAPP10" ], - "debugType": "portable" - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - } - } - }, - "net451": { - "buildOptions": { - "debugType": "full", - "define": [ "NET451" ] - }, - "frameworkAssemblies": { - }, - "dependencies": { - } - } - } -} \ No newline at end of file diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey/Microsoft.Azure.KeyVault.WebKey.csproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey/Microsoft.Azure.KeyVault.WebKey.csproj new file mode 100644 index 0000000000000..c7d8cb755e811 --- /dev/null +++ b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey/Microsoft.Azure.KeyVault.WebKey.csproj @@ -0,0 +1,45 @@ + + + + Microsoft.Azure.KeyVault.WebKey + Microsoft Azure Key Vault WebKey Class Library + Microsoft Azure Key Vault WebKey + Microsoft.Azure.KeyVault.WebKey + 2.0.4 + Microsoft Azure key vault WebKey + + + net452;netstandard1.4 + + + + + + + + + + + + + + + + + diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey/Microsoft.Azure.KeyVault.WebKey.xproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey/Microsoft.Azure.KeyVault.WebKey.xproj deleted file mode 100644 index c3d25ac35eb68..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey/Microsoft.Azure.KeyVault.WebKey.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 643372ad-2dbc-4395-95b9-61183d3f2904 - Microsoft.Azure.KeyVault.WebKey - .\obj - .\bin\ - - - 2.0 - - - True - - - \ No newline at end of file diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey/project.json b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey/project.json deleted file mode 100644 index da9a2ebc29122..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.WebKey/project.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "version": "2.0.4", - "title": "Microsoft Azure Key Vault WebKey", - "description": "Microsoft Azure Key Vault WebKey Class Library", - "authors": [ "Microsoft" ], - - "packOptions": { - "summary": "Class library for Azure Key Vault WebKey", - "projectUrl": "https://github.com/Azure/azure-sdk-for-net", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "tags": [ "Microsoft Azure key vault WebKey" ], - "requireLicenseAcceptance": true, - "releaseNotes": "" - }, - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../../tools/MSSharedLibKey.snk", - "xmlDoc": true - }, - "frameworks": { - "net45": { - "buildOptions": { - "debugType": "full", - "define": [ "NET45" ] - }, - "frameworkAssemblies": { - }, - "dependencies": { - "Newtonsoft.Json": "6.0.8" - } - }, - "netstandard1.5": { - "buildOptions": { - "debugType": "portable", - "define": [ "NETSTANDARD", "NETSTANDARD15" ] - }, - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "System.Collections": "4.0.11", - "System.Runtime": "4.1.0", - "System.Security.Cryptography.Algorithms": "4.2.0", - "System.Collections.Concurrent": "4.0.12", - "System.Linq": "4.1.0", - "Newtonsoft.Json": "[9.0.1,10.0)" - } - } - }, - "configurations": { - } -} diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.sln b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.sln index 7faa6288fc8e7..4e285375f22d0 100644 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.sln +++ b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault.sln @@ -1,27 +1,27 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26403.7 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.KeyVault", "Microsoft.Azure.KeyVault\Microsoft.Azure.KeyVault.xproj", "{F0FBD614-4B4B-445B-B562-235CDB3844B7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.KeyVault", "Microsoft.Azure.KeyVault\Microsoft.Azure.KeyVault.csproj", "{F0FBD614-4B4B-445B-B562-235CDB3844B7}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.KeyVault.Tests", "Microsoft.Azure.KeyVault.Tests\Microsoft.Azure.KeyVault.Tests.xproj", "{6F5823CD-D1D7-4DF4-BE61-F07FD8134400}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.KeyVault.Tests", "Microsoft.Azure.KeyVault.Tests\Microsoft.Azure.KeyVault.Tests.csproj", "{6F5823CD-D1D7-4DF4-BE61-F07FD8134400}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.KeyVault.Core", "Microsoft.Azure.KeyVault.Core\Microsoft.Azure.KeyVault.Core.xproj", "{BE53CF33-9A3D-4101-9DFD-62AC09CADADA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.KeyVault.Core", "Microsoft.Azure.KeyVault.Core\Microsoft.Azure.KeyVault.Core.csproj", "{BE53CF33-9A3D-4101-9DFD-62AC09CADADA}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.KeyVault.Cryptography", "Microsoft.Azure.KeyVault.Cryptography\Microsoft.Azure.KeyVault.Cryptography.xproj", "{9021F320-DE06-433B-ADBC-25A5BC0AA43B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.KeyVault.Cryptography", "Microsoft.Azure.KeyVault.Cryptography\Microsoft.Azure.KeyVault.Cryptography.csproj", "{9021F320-DE06-433B-ADBC-25A5BC0AA43B}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.KeyVault.Cryptography.Tests", "Microsoft.Azure.KeyVault.Cryptography.Tests\Microsoft.Azure.KeyVault.Cryptography.Tests.xproj", "{E01674C0-B8D7-4598-971C-48B0180E273F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.KeyVault.Cryptography.Tests", "Microsoft.Azure.KeyVault.Cryptography.Tests\Microsoft.Azure.KeyVault.Cryptography.Tests.csproj", "{E01674C0-B8D7-4598-971C-48B0180E273F}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.KeyVault.Extensions", "Microsoft.Azure.KeyVault.Extensions\Microsoft.Azure.KeyVault.Extensions.xproj", "{9021F320-DE06-433B-ADBC-25A5BC0AA43C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.KeyVault.Extensions", "Microsoft.Azure.KeyVault.Extensions\Microsoft.Azure.KeyVault.Extensions.csproj", "{9021F320-DE06-433B-ADBC-25A5BC0AA43C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.KeyVault.Extensions.Tests", "Microsoft.Azure.KeyVault.Extensions.Tests\Microsoft.Azure.KeyVault.Extensions.Tests.xproj", "{E01674C0-B8D7-4598-971C-48B0180E274A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.KeyVault.Extensions.Tests", "Microsoft.Azure.KeyVault.Extensions.Tests\Microsoft.Azure.KeyVault.Extensions.Tests.csproj", "{E01674C0-B8D7-4598-971C-48B0180E274A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.KeyVault.TestFramework", "Microsoft.Azure.KeyVault.TestFramework\Microsoft.Azure.KeyVault.TestFramework.xproj", "{6F5823CD-D1D7-4DF4-BE61-F07FD8134433}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.KeyVault.TestFramework", "Microsoft.Azure.KeyVault.TestFramework\Microsoft.Azure.KeyVault.TestFramework.csproj", "{6F5823CD-D1D7-4DF4-BE61-F07FD8134433}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.KeyVault.WebKey", "Microsoft.Azure.KeyVault.WebKey\Microsoft.Azure.KeyVault.WebKey.xproj", "{643372AD-2DBC-4395-95B9-61183D3F2904}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.KeyVault.WebKey", "Microsoft.Azure.KeyVault.WebKey\Microsoft.Azure.KeyVault.WebKey.csproj", "{643372AD-2DBC-4395-95B9-61183D3F2904}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.KeyVault.WebKey.Tests", "Microsoft.Azure.KeyVault.WebKey.Tests\Microsoft.Azure.KeyVault.WebKey.Tests.xproj", "{6F5823CD-D1D7-4DF4-BE61-F07FD813440A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.KeyVault.WebKey.Tests", "Microsoft.Azure.KeyVault.WebKey.Tests\Microsoft.Azure.KeyVault.WebKey.Tests.csproj", "{6F5823CD-D1D7-4DF4-BE61-F07FD813440A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault/Microsoft.Azure.KeyVault.csproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault/Microsoft.Azure.KeyVault.csproj new file mode 100644 index 0000000000000..4811baa89ab1c --- /dev/null +++ b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault/Microsoft.Azure.KeyVault.csproj @@ -0,0 +1,24 @@ + + + + Microsoft.Azure.KeyVault + Azure Key Vault enables users to store and use cryptographic keys within the Microsoft Azure environment. Azure Key Vault supports multiple key types and algorithms and enables the use of Hardware Security Modules (HSM) for high value customer keys. In addition, Azure Key Vault allows users to securely store secrets in a Key Vault; secrets are limited size octet objects and Azure Key Vault applies no specific semantics to these objects. A Key Vault may contain a mix of keys and secrets at the same time, and access control for the two types of object is independently controlled. Users, subject to appropriate authorization, may: 1) Manage cryptographic keys using Create, Import, Update, Delete and other operations 2) Manage secrets using Get, Set, Delete and other operations 3) Use cryptographic keys with Sign/Verify, WrapKey/UnwrapKey and Encrypt/Decrypt operations. Operations against Key Vaults are authenticated and authorized using Azure Active Directory. Key Vault now supports certificates, a complex type that makes use of existing key and secret infrastructure for certificate operations. KV certificates also support notification and auto-renewal as well as other management features. + Microsoft Azure key vault + 2.1.0-preview + Microsoft.Azure.KeyVault + Microsoft Azure key vault;Key Vault;REST HTTP client;azureofficial;windowsazureofficial + This is a preview release of the Azure Key Vault .NET SDK, based on version 2015-06-01 of the Azure Key Vault REST API. For migration guide from version 1.0, please visit https://azure.microsoft.com/en-us/documentation/articles/key-vault-dotnet2api-release-notes/. + + + net452;netstandard1.4 + + + + + + + + + + + diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault/Microsoft.Azure.KeyVault.xproj b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault/Microsoft.Azure.KeyVault.xproj deleted file mode 100644 index 3695a3a08a3fe..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault/Microsoft.Azure.KeyVault.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - f0fbd614-4b4b-445b-b562-235cdb3844b7 - Microsoft.Azure.KeyVault - .\obj - .\bin\ - - - 2.0 - - - True - - - diff --git a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault/project.json b/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault/project.json deleted file mode 100644 index ae356daf5edf4..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/Microsoft.Azure.KeyVault/project.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "version": "2.1.0-preview", - "title": "Microsoft Azure key vault", - "description": "Azure Key Vault enables users to store and use cryptographic keys within the Microsoft Azure environment. Azure Key Vault supports multiple key types and algorithms and enables the use of Hardware Security Modules (HSM) for high value customer keys. In addition, Azure Key Vault allows users to securely store secrets in a Key Vault; secrets are limited size octet objects and Azure Key Vault applies no specific semantics to these objects. A Key Vault may contain a mix of keys and secrets at the same time, and access control for the two types of object is independently controlled. Users, subject to appropriate authorization, may: 1) Manage cryptographic keys using Create, Import, Update, Delete and other operations 2) Manage secrets using Get, Set, Delete and other operations 3) Use cryptographic keys with Sign/Verify, WrapKey/UnwrapKey and Encrypt/Decrypt operations. Operations against Key Vaults are authenticated and authorized using Azure Active Directory. Key Vault now supports certificates, a complex type that makes use of existing key and secret infrastructure for certificate operations. KV certificates also support notification and auto-renewal as well as other management features.", - "authors": [ "Microsoft" ], - - "packOptions": { - "summary": "Class library for using Azure Key Vault", - "tags": [ "Microsoft Azure key vault", "Key Vault", "REST HTTP client", "azureofficial", "windowsazureofficial" ], - "projectUrl": "https://github.com/Azure/azure-sdk-for-net", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "iconUrl": "", - "requireLicenseAcceptance": true, - "releaseNotes": "This is a preview release of the Azure Key Vault .NET SDK, based on version 2015-06-01 of the Azure Key Vault REST API. For migration guide from version 1.0, please visit https://azure.microsoft.com/en-us/documentation/articles/key-vault-dotnet2api-release-notes/." - }, - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../../tools/MSSharedLibKey.snk", - "xmlDoc": true - }, - - "dependencies": { - "Microsoft.Azure.KeyVault.WebKey": "[2.0.4, 3.0)", - "Microsoft.Rest.ClientRuntime": "[2.3.2, 3.0)", - "Microsoft.Rest.ClientRuntime.Azure": "[3.3.1, 4.0)" - }, - - "frameworks": { - "net45": { - "buildOptions": { - "debugType": "portable", - "define": [ "NET45" ] - }, - "dependencies": { - }, - "frameworkAssemblies": { - } - }, - "netstandard1.5": { - "buildOptions": { - "debugType": "portable", - "define": [ "NETSTANDARD", "NETSTANDARD15" ] - }, - "dependencies": { - }, - "frameworkAssemblies": { - } - } - } -} diff --git a/src/SDKs/KeyVault/dataPlane/dirs.proj b/src/SDKs/KeyVault/dataPlane/dirs.proj new file mode 100644 index 0000000000000..e4e3e5a7a63fd --- /dev/null +++ b/src/SDKs/KeyVault/dataPlane/dirs.proj @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SDKs/KeyVault/dataPlane/global.json b/src/SDKs/KeyVault/dataPlane/global.json deleted file mode 100644 index 76bb51445ecf9..0000000000000 --- a/src/SDKs/KeyVault/dataPlane/global.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "projects": [ - "Microsoft.Azure.KeyVault", - "Microsoft.Azure.KeyVault.Core", - "Microsoft.Azure.KeyVault.Cryptography", - "Microsoft.Azure.KeyVault.Extensions" - ] -} \ No newline at end of file diff --git a/src/SDKs/KeyVault/global.json b/src/SDKs/KeyVault/global.json deleted file mode 100644 index 6c33e99913815..0000000000000 --- a/src/SDKs/KeyVault/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "projects": [ "Microsoft.Azure.Management.KeyVault" ] -} \ No newline at end of file diff --git a/src/SDKs/dirs.proj b/src/SDKs/dirs.proj index 78029e9682035..946f2dd8007d4 100644 --- a/src/SDKs/dirs.proj +++ b/src/SDKs/dirs.proj @@ -1,5 +1,6 @@  - + + @@ -42,8 +43,7 @@ - - + - + - diff --git a/src/SdkCommon/ClientRuntime/Test/ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.csproj b/src/SdkCommon/ClientRuntime/Test/ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.csproj index 06a673f62ed1a..e80c5f5bc7029 100644 --- a/src/SdkCommon/ClientRuntime/Test/ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.csproj +++ b/src/SdkCommon/ClientRuntime/Test/ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.csproj @@ -11,6 +11,9 @@ netcoreapp1.1 true + + 1701;1702;1705 + diff --git a/src/dirs.proj b/src/dirs.proj index 7e2d9c46569a1..a2fd25a75ba5d 100644 --- a/src/dirs.proj +++ b/src/dirs.proj @@ -1,4 +1,4 @@  - + diff --git a/test.props b/test.props index 3d3a025cad88e..d37addb082973 100644 --- a/test.props +++ b/test.props @@ -39,8 +39,8 @@ - - - + + + \ No newline at end of file diff --git a/tools/buildTargets/common.targets b/tools/buildTargets/common.targets index d86a7efbb79fe..74df1cd98e2a9 100644 --- a/tools/buildTargets/common.targets +++ b/tools/buildTargets/common.targets @@ -163,23 +163,32 @@ - - + + - - + + + - - - + + + + + + + + +