Skip to content

merge master #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuzhangyi merged 19 commits into from
Aug 7, 2019
Merged

merge master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1ab5384
Add Azure.Core release notes (#7114)
pakrym Aug 5, 2019
3921271
Moving magic values and adding into Constants (#7102)
amnguye Aug 5, 2019
3d1c9c4
[Event Hubs Client] Track Two: Second Preview (Documentation Updates)
jsquire Aug 5, 2019
330bb1e
Bump up SF Processor version (#7116)
serkantkaraca Aug 5, 2019
495cd96
Update package reference to Azure.Core preview.7 (#7117)
pakrym Aug 5, 2019
9a9edc5
Serkar.remove amqp specific versioning (#7122)
serkantkaraca Aug 5, 2019
817300c
Add Storage Preview 2 release notes (#7121)
tg-msft Aug 5, 2019
53c5537
Enable sdkautomation for v2 (#7111)
Aug 6, 2019
9dff740
[Event Hubs Client] Track Two: Second Preview (Samples) …
jsquire Aug 5, 2019
24fc5a5
[EventHubs] Track Two: Second Preview (InMemoryPartitionManager) (#7119)
kinelski Aug 6, 2019
2aa7a4e
Removing ConfigurationWatcher class and tests. (#7132)
annelo-msft Aug 6, 2019
017b4eb
[EventHubs] Track Two: Second Preview (Bug fix) (#7135)
kinelski Aug 6, 2019
8279033
Updating Azure.Identity release notes (#7131)
Aug 6, 2019
d5e80c4
[CODEOWNERS]
jsquire Aug 6, 2019
9bc2bf8
[Azure Search] Fix the definition of WebApiSkill (#7080)
arv100kri Aug 6, 2019
6756d9a
Update KV.Secrets release notes (#7145)
pakrym Aug 6, 2019
7ed78fa
[Event Hubs Client] Track Two: Second Preview (Changelog)
jsquire Aug 6, 2019
61c7646
Switch Azure.Identity to package reference in Microsoft.Extensions.Az…
pakrym Aug 6, 2019
4fe2be5
Updates for Azure Batch DataPlane version 12.0 (#7136)
matthchr Aug 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

/sdk/eventgrid/ @kalyanaj

/sdk/eventhub/ @serkantkaraca
/sdk/eventhub/ @serkantkaraca @jsquire @kinelski
/sdk/eventhub/azure.messaging.eventhubs/ @jsquire @kinelski

/sdk/identity/azure.identity/ @schaabs
Expand All @@ -31,7 +31,7 @@
/sdk/keyvault/azure.*/ @schaabs @shahabhijeet

/sdk/search/ @brjohnstmsft
/sdk/servicebus/ @nemakam
/sdk/servicebus/ @nemakam @jsquire
/sdk/storage/ @kfarmer-msft @seanmcc-msft @tg-msft
# Management Plane
/**/*Management*/ @erich-wang
Expand Down
2 changes: 1 addition & 1 deletion eng/Directory.Build.Data.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<DelaySign>false</DelaySign>
<PublicSign>false</PublicSign>
<ImportDefaultReferences>false</ImportDefaultReferences>
<UseProjectReferenceToAzureCore>true</UseProjectReferenceToAzureCore>
<UseProjectReferenceToAzureCore>false</UseProjectReferenceToAzureCore>
<LangVersion>preview</LangVersion>
<DocumentationFile>$(IntermediateOutputPath)$(TargetFramework)\$(MSBuildProjectName).xml</DocumentationFile>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion eng/Packages.Data.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
<ItemGroup>
<PackageReference Update="ApprovalTests" Version="3.0.22" />
<PackageReference Update="ApprovalUtilities" Version="3.0.22" />
<PackageReference Update="Azure.Core" Version="1.0.0-preview.6" />
<PackageReference Update="Azure.Core" Version="1.0.0-preview.7" />
<PackageReference Update="Azure.Identity" Version="1.0.0-preview.3" />
<PackageReference Update="BenchmarkDotNet" Version="0.11.5" />
<PackageReference Update="FsCheck.Xunit" Version="2.14.0" />
<PackageReference Update="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
Expand Down
6 changes: 3 additions & 3 deletions eng/mgmt/mgmtmetadata/search_data-plane_Microsoft.Azure.Search.Service.txt
View file
Open in desktop
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/search/data-plane/Microsoft.Azure.Search.Service/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=C:\repos\azure-sdk-for-net\sdk
2019-07-25 22:29:05 UTC
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/search/data-plane/Microsoft.Azure.Search.Service/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\src\azure-sdk-for-net\sdk
2019-08-01 17:40:34 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: a28a3fca492d332b0e515f0017551cb692772b29
Commit: 39c47bb0623a056d760175c63688d688e0020faa
AutoRest information
Requested version: latest
Bootstrapper version: autorest@2.0.4283
3 changes: 1 addition & 2 deletions packages.md
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
| [`Azure.Core`]( sdk/core/Azure.Core/src/Azure.Core.csproj )| [Readme](sdk/core/Azure.Core/README.md) | N/A | [Nuget]( https://www.nuget.org/packages/Azure.Core/ ) |
| [`Azure.Core.Extensions`]( sdk/core/Azure.Core.Extensions/src/Azure.Core.Extensions.csproj )| N/A | N/A | [Nuget]( https://www.nuget.org/packages/Azure.Core.Extensions/ ) |
| [`Azure.Identity`]( sdk/identity/Azure.Identity/src/Azure.Identity.csproj )| [Readme](sdk/identity/Azure.Identity/README.md) | N/A | [Nuget]( https://www.nuget.org/packages/Azure.Identity/ ) |
| [`Azure.Messaging.EventHubs`]( sdk/eventhub/Azure.Messaging.EventHubs/src/Azure.Messaging.EventHubs.csproj )| [Readme](sdk/eventhub/Azure.Messaging.EventHubs/README.md) | N/A | [Nuget]( https://www.nuget.org/packages/Azure.Messaging.EventHubs/ ) |
| [`Azure.Messaging.EventHubs.TrackOne`]( sdk/eventhub/Azure.Messaging.EventHubs/src/TrackOneClient/Azure.Messaging.EventHubs.TrackOne.csproj )| [Readme](sdk/eventhub/Azure.Messaging.EventHubs/README.md) | N/A | N/A |
| [`Azure.Messaging.EventHubs`]( sdk/eventhub/Azure.Messaging.EventHubs/src/Azure.Messaging.EventHubs.csproj )| [Readme](sdk/eventhub/Azure.Messaging.EventHubs/README.md) | [Changelog](https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/eventhub/Azure.Messaging.EventHubs/CHANGELOG.md) | [Nuget]( https://www.nuget.org/packages/Azure.Messaging.EventHubs/ ) |
| [`Azure.Security.KeyVault.Secrets`]( sdk/keyvault/Azure.Security.KeyVault.Secrets/src/Azure.Security.KeyVault.Secrets.csproj )| N/A | N/A | [Nuget]( https://www.nuget.org/packages/Azure.Security.KeyVault.Secrets/ ) |
| [`Azure.Security.Keyvault.Keys`]( sdk/keyvault/Azure.Security.KeyVault.Keys/src/Azure.Security.Keyvault.Keys.csproj )| N/A | N/A | [Nuget]( https://www.nuget.org/packages/Azure.Security.Keyvault.Keys/ ) |
| [`Azure.Storage.Blobs`]( sdk/storage/Azure.Storage.Blobs/src/Azure.Storage.Blobs.csproj )| [Readme](sdk/storage/Azure.Storage.Blobs/README.md) | N/A | [Nuget]( https://www.nuget.org/packages/Azure.Storage.Blobs/ ) |
Expand Down
139 changes: 0 additions & 139 deletions sdk/appconfiguration/Azure.ApplicationModel.Configuration/tests/ConfigurationWatcher.cs
View file
Open in desktop

This file was deleted.

108 changes: 0 additions & 108 deletions sdk/appconfiguration/Azure.ApplicationModel.Configuration/tests/ConfigurationWatcherTests.cs
View file
Open in desktop

This file was deleted.

34 changes: 2 additions & 32 deletions sdk/batch/Microsoft.Azure.Batch/Microsoft.Azure.Batch.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.452
# Visual Studio 15
VisualStudioVersion = 15.0.28307.645
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Batch", "src\Microsoft.Azure.Batch.csproj", "{A8548C94-A0EA-438D-9226-11142F2646B9}"
EndProject
Expand All @@ -15,10 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Batch.Unit.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeGenerationLibrary", "tools\CodeGenerationLibrary\CodeGenerationLibrary.csproj", "{D15F9643-2956-499E-A94A-5171D5A47D9A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfigureAwaitAnalyzer.Tests", "tools\ConfigureAwaitAnalyzerTests\ConfigureAwaitAnalyzer.Tests.csproj", "{AB0EB56A-413A-4CBE-AF93-F99AB6C0798A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfigureAwaitAnalyzer", "tools\ConfigureAwaitAnalyzer\ConfigureAwaitAnalyzer.csproj", "{E6F7F36C-C370-438A-A8F2-8B7A021B5155}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ObjectModelCodeGenerator", "tools\ObjectModelCodeGenerator\ObjectModelCodeGenerator.csproj", "{718237FC-37F8-4557-B2FB-70DF3255AAF5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProxyLayerParser", "tools\RoslynParser\ProxyLayerParser.csproj", "{403E2952-7152-4F52-B7FD-5BF8A4691B48}"
Expand Down Expand Up @@ -111,30 +107,6 @@ Global
{D15F9643-2956-499E-A94A-5171D5A47D9A}.Portable-Release|Any CPU.Build.0 = Release|Any CPU
{D15F9643-2956-499E-A94A-5171D5A47D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D15F9643-2956-499E-A94A-5171D5A47D9A}.Release|Any CPU.Build.0 = Release|Any CPU
{AB0EB56A-413A-4CBE-AF93-F99AB6C0798A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB0EB56A-413A-4CBE-AF93-F99AB6C0798A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB0EB56A-413A-4CBE-AF93-F99AB6C0798A}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB0EB56A-413A-4CBE-AF93-F99AB6C0798A}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU
{AB0EB56A-413A-4CBE-AF93-F99AB6C0798A}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU
{AB0EB56A-413A-4CBE-AF93-F99AB6C0798A}.Net45-Release|Any CPU.Build.0 = Release|Any CPU
{AB0EB56A-413A-4CBE-AF93-F99AB6C0798A}.Portable-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB0EB56A-413A-4CBE-AF93-F99AB6C0798A}.Portable-Debug|Any CPU.Build.0 = Debug|Any CPU
{AB0EB56A-413A-4CBE-AF93-F99AB6C0798A}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU
{AB0EB56A-413A-4CBE-AF93-F99AB6C0798A}.Portable-Release|Any CPU.Build.0 = Release|Any CPU
{AB0EB56A-413A-4CBE-AF93-F99AB6C0798A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AB0EB56A-413A-4CBE-AF93-F99AB6C0798A}.Release|Any CPU.Build.0 = Release|Any CPU
{E6F7F36C-C370-438A-A8F2-8B7A021B5155}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E6F7F36C-C370-438A-A8F2-8B7A021B5155}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E6F7F36C-C370-438A-A8F2-8B7A021B5155}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E6F7F36C-C370-438A-A8F2-8B7A021B5155}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU
{E6F7F36C-C370-438A-A8F2-8B7A021B5155}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU
{E6F7F36C-C370-438A-A8F2-8B7A021B5155}.Net45-Release|Any CPU.Build.0 = Release|Any CPU
{E6F7F36C-C370-438A-A8F2-8B7A021B5155}.Portable-Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E6F7F36C-C370-438A-A8F2-8B7A021B5155}.Portable-Debug|Any CPU.Build.0 = Debug|Any CPU
{E6F7F36C-C370-438A-A8F2-8B7A021B5155}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU
{E6F7F36C-C370-438A-A8F2-8B7A021B5155}.Portable-Release|Any CPU.Build.0 = Release|Any CPU
{E6F7F36C-C370-438A-A8F2-8B7A021B5155}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E6F7F36C-C370-438A-A8F2-8B7A021B5155}.Release|Any CPU.Build.0 = Release|Any CPU
{718237FC-37F8-4557-B2FB-70DF3255AAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{718237FC-37F8-4557-B2FB-70DF3255AAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{718237FC-37F8-4557-B2FB-70DF3255AAF5}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -170,8 +142,6 @@ Global
{BEC46645-02DB-4759-B6D9-56B6B17741A5} = {9B6E704C-0833-4CDE-BE2C-603A4087BAC9}
{11F0374A-3609-4C9C-B57B-BB7876C76DA4} = {9B6E704C-0833-4CDE-BE2C-603A4087BAC9}
{D15F9643-2956-499E-A94A-5171D5A47D9A} = {48070FB2-8BB9-4EE4-A8BD-413B2C2B8ED4}
{AB0EB56A-413A-4CBE-AF93-F99AB6C0798A} = {48070FB2-8BB9-4EE4-A8BD-413B2C2B8ED4}
{E6F7F36C-C370-438A-A8F2-8B7A021B5155} = {48070FB2-8BB9-4EE4-A8BD-413B2C2B8ED4}
{718237FC-37F8-4557-B2FB-70DF3255AAF5} = {48070FB2-8BB9-4EE4-A8BD-413B2C2B8ED4}
{403E2952-7152-4F52-B7FD-5BF8A4691B48} = {48070FB2-8BB9-4EE4-A8BD-413B2C2B8ED4}
EndGlobalSection
Expand Down
3 changes: 2 additions & 1 deletion sdk/batch/Microsoft.Azure.Batch/Tools/CodeGenerationLibrary/CodeGenerationLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
<PropertyGroup>
<Description>Azure Batch object model code generation library</Description>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<SignAssembly>false</SignAssembly>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net46</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>
</Project>
Loading