Skip to content
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.

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

Update arm response types to match current Azure.Core pattern #20738

Merged
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
0f3f806
WIP
m-nash Mar 22, 2021
0f52a38
wip
m-nash Mar 24, 2021
10f6ad0
Change the accessbility to virtual for Resource.Id
YalinLi0312 Mar 24, 2021
1f81d59
merge from feature/mgmt-track2
Mar 30, 2021
c192698
update strawman for operation changes
Apr 1, 2021
ccc17c7
merge from usptream
Apr 5, 2021
5060f5c
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
m-nash Apr 12, 2021
795c706
merge from mgmt-track2
m-nash Apr 14, 2021
2f90c91
finalize changes before testing
m-nash Apr 14, 2021
d0407f6
update ph overloads
m-nash Apr 14, 2021
c7305e8
move pipeline creation into armoperation
m-nash Apr 14, 2021
30e529d
wip
m-nash Apr 21, 2021
e358938
merge
m-nash Apr 26, 2021
7db165a
updates based on new OperationInternals
m-nash Apr 28, 2021
a4e5bae
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
m-nash Apr 28, 2021
ec173e7
address PR comments
m-nash Apr 29, 2021
5a9fff2
update test classes to use new pattern
m-nash Apr 30, 2021
381cc03
merge from upstream
m-nash Apr 30, 2021
a6217d6
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
m-nash May 4, 2021
d7c8171
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
m-nash May 5, 2021
cd712bb
final fixes for arm core tests
m-nash May 5, 2021
8649b18
use mock response instead of null
m-nash May 5, 2021
09bb02b
updates to proto code
m-nash May 5, 2021
f888e32
add null check around basetype
m-nash May 5, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
All should have PrivateAssets="All" set so they don't become pacakge dependencies
-->
<ItemGroup>
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20210414.5" PrivateAssets="All" />
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20210426.2" PrivateAssets="All" />
<PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20210322.2" PrivateAssets="All" />
<PackageReference Update="coverlet.collector" Version="1.3.0" PrivateAssets="All" />
<PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />
Expand Down
1 change: 1 addition & 0 deletions sdk/core/Azure.Core/tests/Azure.Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
<DefineConstants>$(DefineConstants);HAS_INTERNALS_VISIBLE_CORE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeGeneratorSharedCode>true</IncludeGeneratorSharedCode>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 5 additions & 2 deletions sdk/core/Azure.Core/tests/TestClients/ArmOperationTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
// Licensed under the MIT License.

using System;
using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using Azure.Core;
using Azure.ResourceManager.Core;

namespace Azure.Core.Tests
Expand Down Expand Up @@ -53,15 +56,15 @@ public override ValueTask<Response<T>> WaitForCompletionAsync(TimeSpan pollingIn
return new ValueTask<Response<T>>(Response.FromValue(_value, null));
}

public override ValueTask<Response> UpdateStatusAsync(CancellationToken cancellationToken = default)
public override T CreateResult(Response response, CancellationToken cancellationToken)
{
if (_exceptionOnWait)
throw new ArgumentException("FakeArg");

return new ValueTask<Response>(Response.FromValue(_value, null) as Response);
}

public override Response UpdateStatus(CancellationToken cancellationToken = default)
public async override ValueTask<T> CreateResultAsync(Response response, CancellationToken cancellationToken)
{
if (_exceptionOnWait)
throw new ArgumentException("FakeArg");
Expand Down
83 changes: 0 additions & 83 deletions sdk/resourcemanager/Azure.ResourceManager.Core/src/ArmOperation.cs

This file was deleted.

46 changes: 0 additions & 46 deletions sdk/resourcemanager/Azure.ResourceManager.Core/src/ArmResponse.cs

This file was deleted.

116 changes: 0 additions & 116 deletions sdk/resourcemanager/Azure.ResourceManager.Core/src/ArmVoidOperation.cs

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading