Skip to content

Commit

Permalink
reset to master
Browse files Browse the repository at this point in the history
  • Loading branch information
rileymckenna committed Aug 26, 2019
1 parent b4ab889 commit 151b3e6
Show file tree
Hide file tree
Showing 3,430 changed files with 33,301 additions and 40,275 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions Documentation/Using-Azure-TestFramework.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ To use this option, set the following environment variable before starting Visua

## 4. Record/Playback Tests

1. Run the test and make sure that you got a generated .json file that matches the test name in the SessionRecords folder (usually be $sdk/artifacts/bin/{YOUR TEST PROJECT NAME}/{Configuration}/{TargetFramework}/SessionRecords)
2. Copy above SessionRecords folder back to the same level as test .csproj of your service, then add all *.json files to your test project in Visual Studio setting "Copy to Output Directory" property to "Copy if newer"
1. Run the test and make sure that you got a generated .json file that matches the test name in the bin folder under *SessionRecords folder
2. Copy SessionRecords folder inside the test project and add all *.json files in Visual Studio setting "Copy to Output Directory" property to "Copy if newer"
3. To assure that the records work fine, delete the connection string (default mode is Playback mode) OR change HttpRecorderMode within the connection string to "Playback"

## 5. Change Test Environment settings at run-time
Expand Down
1 change: 1 addition & 0 deletions Documentation/sdk-for-net-packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Below are the packages maintained in this repository.
| Notification Hubs | `Microsoft.Azure.Management.NotificationHubs` | [![Notification Hubs](https://img.shields.io/nuget/vpre/Microsoft.Azure.Management.NotificationHubs.svg)](https://www.nuget.org/packages/Microsoft.Azure.Management.NotificationHubs) |
| Peering | `Microsoft.Azure.Management.Peering` | [![Peering](https://img.shields.io/nuget/vpre/Microsoft.Azure.Management.Peering.svg)](https://www.nuget.org/packages/Microsoft.Azure.Management.Peering) |
| Policy Insights | `Microsoft.Azure.Management.PolicyInsights` | [![Policy Insights](https://img.shields.io/nuget/vpre/Microsoft.Azure.Management.PolicyInsights.svg)](https://www.nuget.org/packages/Microsoft.Azure.Management.PolicyInsights) |
| Peering | `Microsoft.Azure.Management.Peering` | [![Peering](https://img.shields.io/nuget/vpre/Microsoft.Azure.Management.Peering.svg)](https://www.nuget.org/packages/Microsoft.Azure.Management.Peering) |
| Operational Insights | `Microsoft.Azure.Management.OperationalInsights` | [![Operational Insights](https://img.shields.io/nuget/vpre/Microsoft.Azure.Management.OperationalInsights.svg)](https://www.nuget.org/packages/Microsoft.Azure.Management.OperationalInsights) |
| Power BI Embedded | `Microsoft.Azure.Management.PowerBIEmbedded` | [![Power BI Embedded](https://img.shields.io/nuget/vpre/Microsoft.Azure.Management.PowerBIEmbedded.svg)](https://www.nuget.org/packages/Microsoft.Azure.Management.PowerBIEmbedded) |
| RecoveryServices | `Microsoft.Azure.Management.RecoveryServices` | [![RecoveryServices](https://img.shields.io/nuget/vpre/Microsoft.Azure.Management.RecoveryServices.svg)](https://www.nuget.org/packages/Microsoft.Azure.Management.RecoveryServices) |
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ These libraries follow the [Azure SDK Design Guidelines for .NET](https://azure.
These preview libraries can be easily identified by their folder, package, and namespaces names starting with 'Azure', e.g. Azure.Storage.Blobs.

The libraries released in the July 2019 preview:
* [Azure.ApplicationModel.Configuration](https://azure.github.io/azure-sdk-for-net/api/Azure.ApplicationModel.Configuration.html)
* [Azure.Messaging.EventHubs](https://azure.github.io/azure-sdk-for-net/api/Azure.Messaging.EventHubs.html)
* [Azure.Security.KeyVault.Keys](https://azure.github.io/azure-sdk-for-net/api/Azure.Security.KeyVault.Keys.html)
* [Azure.Security.KeyVault.Secrets](https://azure.github.io/azure-sdk-for-net/api/Azure.Security.KeyVault.Secrets.html)
* [Azure.Storage.Blobs](https://azure.github.io/azure-sdk-for-net/api/Azure.Storage.Blobs.html)
* [Azure.Storage.Files](https://azure.github.io/azure-sdk-for-net/api/Azure.Storage.Files.html)
* [Azure.Storage.Queues](https://azure.github.io/azure-sdk-for-net/api/Azure.Storage.Queues.html)
* [Azure.ApplicationModel.Configuration](/sdk/appconfiguration/Azure.ApplicationModel.Configuration/README.md)
* [Azure.Messaging.EventHubs](/sdk/eventhub/Azure.Messaging.EventHubs/README.md)
* [Azure.Security.KeyVault.Keys](/sdk/keyvault/Azure.Security.KeyVault.Keys/README.md)
* [Azure.Security.KeyVault.Secrets](/sdk/keyvault/Azure.Security.KeyVault.Secrets/README.md)
* [Azure.Storage.Blobs](/sdk/storage/Azure.Storage.Blobs/README.md)
* [Azure.Storage.Files](/sdk/storage/Azure.Storage.Files/README.md)
* [Azure.Storage.Queues](/sdk/storage/Azure.Storage.Queues/README.md)

>NOTE: If you need to ensure your code is ready for production, use one of the stable libraries.
Expand Down
4 changes: 2 additions & 2 deletions eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<PackageReference Update="Microsoft.Azure.ResourceManager" Version="[1.1.0-preview]" />
<PackageReference Update="Microsoft.Azure.Services.AppAuthentication" Version="[1.0.3, 2.0.0)" />
<PackageReference Update="Microsoft.Azure.Storage.Blob" Version="9.4.2" />
<PackageReference Update="Microsoft.Azure.Test.HttpRecorder" Version="[1.13.3, 2.0.0)" />
<PackageReference Update="Microsoft.Azure.Test.HttpRecorder" Version="[1.13.1, 2.0.0)" />
<PackageReference Update="Microsoft.Bcl.Json.Sources" Version="4.6.0-preview3.19128.7" />
<PackageReference Update="Microsoft.Build.Tasks.Core" Version="15.5.180" />
<PackageReference Update="Microsoft.Build" Version="15.5.180" />
Expand All @@ -47,7 +47,7 @@
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.1.0" />
<PackageReference Update="Microsoft.NETCore.Platforms" Version="2.2.1" />
<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" />
<PackageReference Update="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.7.7, 2.0.0)" />
<PackageReference Update="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.7.5, 2.0.0)" />
<PackageReference Update="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.18, 4.0.0)" />
<PackageReference Update="Microsoft.Rest.ClientRuntime" Version="[2.3.20, 3.0.0)" />
<PackageReference Update="Microsoft.ServiceFabric.Data" Version="3.3.624" />
Expand Down
12 changes: 10 additions & 2 deletions eng/docgeneration/assets/docgen.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,34 @@
<PropertyGroup>
<ECMA2YmlVersion>1.0.644-alpha</ECMA2YmlVersion>
<PopImportVersion>1.0.0</PopImportVersion>
<BclAsyncInterfacesVersion>1.0.0-preview8.19405.3</BclAsyncInterfacesVersion>
<NETStandardVersion>2.0.2</NETStandardVersion>
<NuGetPackageRoot>$(UserProfile)\.nuget\packages</NuGetPackageRoot>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DocAsCode.ECMA2Yaml" Version="$(ECMA2YmlVersion)" />
<PackageReference Include="PopImport" Version="$(PopImportVersion)" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(BclAsyncInterfacesVersion)" />
<PackageReference Include="NETStandard.Library" Version="$(NETStandardVersion)" />
</ItemGroup>
<Target Name="CopyTools" AfterTargets="Restore">
<PropertyGroup>
<BclAsyncInterfacesPath>$(NuGetPackageRoot)\microsoft.bcl.asyncinterfaces\$(BclAsyncInterfacesVersion)\ref\netstandard2.1\Microsoft.Bcl.AsyncInterfaces.dll</BclAsyncInterfacesPath>
<NETStandardPath>$(NuGetPackageRoot)\netstandard.library\$(NETStandardVersion)\build\netstandard2.0\ref\*</NETStandardPath>
<ECMA2YmlPath>$(NuGetPackageRoot)\microsoft.docascode.ecma2yaml\$(ECMA2YmlVersion)\tools\*</ECMA2YmlPath>
<PopImportPath>$(NuGetPackageRoot)\popimport\$(PopImportVersion)\Release\*</PopImportPath>
</PropertyGroup>

<ItemGroup>
<BclAsyncInterfacesFiles Include="$(BclAsyncInterfacesPath)" />
<NETStandardFiles Include="$(NETStandardPath)" />
<ECMA2YmlFiles Include="$(ECMA2YmlPath)" />
<PopImportFiles Include="$(PopImportPath)" />
<RestoredDlls Include="$(NuGetPackageRoot)\**\lib\**\*.dll" />
</ItemGroup>

<Copy SourceFiles="@(BclAsyncInterfacesFiles)" DestinationFolder="$(BuildBinariesDirectory)\dll-docs\dependencies\my-api" />
<Copy SourceFiles="@(NETStandardFiles)" DestinationFolder="$(BuildBinariesDirectory)\dll-docs\dependencies\my-api" />
<Copy SourceFiles="@(ECMA2YmlFiles)" DestinationFolder="$(BuildBinariesDirectory)\ECMA2Yml" />
<Copy SourceFiles="@(PopImportFiles)" DestinationFolder="$(BuildBinariesDirectory)\PopImport" />
<Copy SourceFiles="@(RestoredDlls)" DestinationFolder="$(BuildBinariesDirectory)\dll-docs\dependencies\my-api" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions eng/mgmt/AzSdk.test.reference.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.13.3, 2.0.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.7.7, 2.0.0)" />
<PackageReference Include="Microsoft.Azure.Test.HttpRecorder" Version="[1.13.1, 2.0.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.7.5, 2.0.0)" />
<PackageReference Include="Microsoft.Azure.ResourceManager" Version="[1.1.0-preview]" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ AutoRest installed successfully.
Commencing code generation
Generating CSharp code
Executing AutoRest command
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/resources/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --tag=package-resources-2019-07 --csharp.output-folder=C:\code\temp\sdk-generated-cs
2019-08-16 17:54:31 UTC
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/peering/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=F:\azure\azure-sdk-for-net\sdk
2019-08-23 17:48:19 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: 23326b92394ef630c59833f27e512544162ef4dd
Commit: 8afd6663d145c938b80a9a9709aa2a9b101b3df2
AutoRest information
Requested version: latest
Bootstrapper version: autorest@2.0.4283
12 changes: 5 additions & 7 deletions eng/pipelines/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,14 @@ jobs:
version: $(DotNetCoreSDKVersion)
- pwsh: dotnet build eng/service.proj /p:IncludeTests=false /p:IncludeSamples=false /p:OutputPath=$(Build.ArtifactStagingDirectory)/dll-output /p:TargetFramework=netstandard2.0
displayName: Build Packages
- pwsh: dotnet restore "$(Build.SourcesDirectory)/eng/docgeneration/assets/docgen.csproj" /p:BuildBinariesDirectory=$(Build.BinariesDirectory)
displayName: Restore Nuget Packages Needed
- task: CopyFiles@2
displayName: "Copy over Dlls"
displayName: 'Copy over Dlls'
inputs:
SourceFolder: "$(Build.ArtifactStagingDirectory)/dll-output"
TargetFolder: "$(Build.BinariesDirectory)/dll-docs/my-api"
SourceFolder: '$(Build.ArtifactStagingDirectory)/dll-output'
TargetFolder: '$(Build.BinariesDirectory)/dll-docs/my-api'
contents: |
*.dll
*.xml
*.xml
- task: CmdLine@2
displayName: Initialize Frameworks File
inputs:
Expand Down Expand Up @@ -88,7 +86,7 @@ jobs:
- pwsh: |
Copy-Item "$(Build.SourcesDirectory)/eng/docgeneration/assets/logo.svg" -Destination `
"$(Build.BinariesDirectory)/docfx-output/docfx_project/_site" -Recurse -Force
displayName: "Copy over site logo"
displayName: 'Copy over site logo'
- task: CopyFiles@2
displayName: Copy HTML to Artificats Directory
inputs:
Expand Down
16 changes: 0 additions & 16 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ jobs:
pool:
vmImage: vs2017-win2016
steps:
- checkout: self
path: AzureSDKEngSystem/Net/SourceDirectory
- pwsh: |
echo "##vso[build.addbuildtag]Scheduled"
displayName: "Tag scheduled builds"
Expand Down Expand Up @@ -36,8 +34,6 @@ jobs:
pool:
vmImage: "vs2017-win2016"
steps:
- checkout: self
path: AzureSDKEngSystem/Net/SourceDirectory
- task: UsePythonVersion@0
displayName: "Use Python 3.6"
inputs:
Expand All @@ -60,16 +56,6 @@ jobs:
filePath: "tools/AnalyzeDeps/AnalyzeDeps.ps1"
arguments: '-PackagesPath "$(Pipeline.Workspace)/packages/*.nupkg" -LockfilePath "$(Build.SourcesDirectory)/eng/Packages.Data.props" -OutPath "$(Build.ArtifactStagingDirectory)/dependencies.html"'
pwsh: true
- pwsh: |
Invoke-WebRequest -MaximumRetryCount 10 -Uri "https://github.com/Azure/azure-sdk-tools/releases/download/sdk-tools_95164/sdk-tools.zip" `
-OutFile "sdk-tools.zip" | Wait-Process; Expand-Archive -Path "sdk-tools.zip" -DestinationPath "./sdk-tools/"
workingDirectory: "$(Build.BinariesDirectory)"
displayName: "Download Tools Archive From Github Release and Extract it"
- task: PythonScript@0
displayName: "Analyze Path Lengths"
inputs:
scriptPath: "$(Build.BinariesDirectory)/sdk-tools/scripts/python/verify_path_length.py"
arguments: $(Build.SourcesDirectory)
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
displayName: "Component Detection"
# ComponentGovernance is currently unable to run on pull requests of public projects. Running on
Expand Down Expand Up @@ -108,8 +94,6 @@ jobs:
pool:
vmImage: "$(OSVmImage)"
steps:
- checkout: self
path: AzureSDKEngSystem/Net/SourceDirectory
- pwsh: |
Invoke-WebRequest -MaximumRetryCount 10 -Uri "https://github.com/Azure/azure-sdk-tools/releases/download/sdk-tools_14793/sdk-tools.zip" `
-OutFile "sdk-tools.zip" | Wait-Process; Expand-Archive -Path "sdk-tools.zip" -DestinationPath "./sdk-tools/"
Expand Down
28 changes: 0 additions & 28 deletions eng/pipelines/templates/jobs/archetype-sdk-mgmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ jobs:
pool:
vmImage: windows-2019
steps:
- checkout: self
path: AzureSDKEngSystem/Net/SourceDirectory
- task: DotNetCoreInstaller@0
displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)"
inputs:
Expand Down Expand Up @@ -52,8 +50,6 @@ jobs:
pool:
vmImage: "$(OSVmImage)"
steps:
- checkout: self
path: AzureSDKEngSystem/Net/SourceDirectory
- task: DotNetCoreInstaller@0
displayName: "Use .NET Core sdk $(DotNetCoreSDKVersion)"
inputs:
Expand All @@ -77,27 +73,3 @@ jobs:
# inputs:
# pathtoPublish: $(msBuildLogDir)
# artifactName: MsBuildLogs
- job: "Analyze"
variables:
- template: ../variables/globals.yml
dependsOn:
- Build
pool:
vmImage: windows-2019
steps:
- checkout: self
path: AzureSDKEngSystem/Net/SourceDirectory
- task: UsePythonVersion@0
displayName: "Use Python 3.6"
inputs:
versionSpec: "3.6"
- pwsh: |
Invoke-WebRequest -MaximumRetryCount 10 -Uri "https://github.com/Azure/azure-sdk-tools/releases/download/sdk-tools_95164/sdk-tools.zip" `
-OutFile "sdk-tools.zip" | Wait-Process; Expand-Archive -Path "sdk-tools.zip" -DestinationPath "./sdk-tools/"
workingDirectory: "$(Build.BinariesDirectory)"
displayName: "Download Tools Archive From Github Release and Extract it"
- task: PythonScript@0
displayName: "Analyze Path Lengths"
inputs:
scriptPath: "$(Build.BinariesDirectory)/sdk-tools/scripts/python/verify_path_length.py"
arguments: $(Build.SourcesDirectory)
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class ConfigurationTests
[Fact]
public void ConfigureSubscriptionTest()
{
using (var context = MockContext.Start(this.GetType()))
using (var context = MockContext.Start(this.GetType().FullName))
{
var config = new ConfigData
{
Expand All @@ -44,7 +44,7 @@ public void ConfigureSubscriptionTest()
[Fact]
public void ConfigureResourceGroupTest()
{
using (var context = MockContext.Start(this.GetType()))
using (var context = MockContext.Start(this.GetType().FullName))
{
var config = new ConfigData {Properties = new ConfigDataProperties {Exclude = true}};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class RecommendationTests
[Fact]
public void GenerateRecommendationsTest()
{
using (var context = MockContext.Start(this.GetType()))
using (var context = MockContext.Start(this.GetType().FullName))
{
using (var client = context.GetServiceClient<AdvisorManagementClient>())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class SuppressionTests
[Fact]
public void SuppressionsTest()
{
using (var context = MockContext.Start(this.GetType()))
using (var context = MockContext.Start(this.GetType().FullName))
{
using (var client = context.GetServiceClient<AdvisorManagementClient>())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public ActionRuleTests() : base()
[Trait("Category", "Scenario")]
public void FilterByParametersGetActionRulesTest()
{
using (MockContext context = MockContext.Start(this.GetType()))
using (MockContext context = MockContext.Start(this.GetType().FullName))
{
var alertsManagementClient = GetAlertsManagementClient(context, handler);

Expand Down Expand Up @@ -60,7 +60,7 @@ public void FilterByParametersGetActionRulesTest()
[Trait("Category", "Scenario")]
public void FilterByResourceGroupGetActionRulesTest()
{
using (MockContext context = MockContext.Start(this.GetType()))
using (MockContext context = MockContext.Start(this.GetType().FullName))
{
var alertsManagementClient = GetAlertsManagementClient(context, handler);

Expand All @@ -79,7 +79,7 @@ public void FilterByResourceGroupGetActionRulesTest()
[Trait("Category", "Scenario")]
public void CreateAndDeleteActionRule()
{
using (MockContext context = MockContext.Start(this.GetType()))
using (MockContext context = MockContext.Start(this.GetType().FullName))
{
var alertsManagementClient = GetAlertsManagementClient(context, handler);

Expand Down Expand Up @@ -145,7 +145,7 @@ public void CreateAndDeleteActionRule()
[Trait("Category", "Scenario")]
public void CreateAndUpdateActionRule()
{
using (MockContext context = MockContext.Start(this.GetType()))
using (MockContext context = MockContext.Start(this.GetType().FullName))
{
var alertsManagementClient = GetAlertsManagementClient(context, handler);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public AlertsTests() : base()
[Trait("Category", "Scenario")]
public void AlertStateChangeTest()
{
using (MockContext context = MockContext.Start(this.GetType()))
using (MockContext context = MockContext.Start(this.GetType().FullName))
{
var alertsManagementClient = GetAlertsManagementClient(context, handler);

Expand Down Expand Up @@ -66,7 +66,7 @@ public void AlertStateChangeTest()
[Trait("Category", "Scenario")]
public void FilterByParametersGetAlertsTest()
{
using (MockContext context = MockContext.Start(this.GetType()))
using (MockContext context = MockContext.Start(this.GetType().FullName))
{
var alertsManagementClient = GetAlertsManagementClient(context, handler);

Expand Down Expand Up @@ -94,7 +94,7 @@ public void FilterByParametersGetAlertsTest()
[Trait("Category", "Scenario")]
public void AlertsSummaryTest()
{
using (MockContext context = MockContext.Start(this.GetType()))
using (MockContext context = MockContext.Start(this.GetType().FullName))
{
var alertsManagementClient = GetAlertsManagementClient(context, handler);

Expand Down
Loading

0 comments on commit 151b3e6

Please sign in to comment.