Skip to content

Commit

Permalink
Dumped new PR changes
Browse files Browse the repository at this point in the history
  • Loading branch information
chidozieononiwu committed Jun 11, 2019
1 parent e0791ca commit e59953e
Show file tree
Hide file tree
Showing 178 changed files with 8,845 additions and 3,598 deletions.
40 changes: 40 additions & 0 deletions eng/mgmt/AzSdk.reference.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.19, 4.0.0)" />
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.19, 3.0.0)" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup>
<SdkTargetFx>net452;net461;netstandard1.4;netstandard2.0</SdkTargetFx>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
<PackageReference Include="System.Net.Http" Version="4.3.0"/>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Net.Http" Version="4.3.0"/>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<PackageReference Include="System.Net.Http" Version="4.3.0"/>
<PackageReference Include="Newtonsoft.Json" Version="6.0.8" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Reference Include="System.Net" />
<Reference Include="System.Net.Http" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>
<PropertyGroup>
<EnablePreBuildTarget Condition=" '$(EnablePreBuildTarget)' == '' ">true</EnablePreBuildTarget>
<EnablePostBuildTarget Condition=" '$(EnablePostBuildTarget)' == '' ">true</EnablePostBuildTarget>
</PropertyGroup>

</Project>
15 changes: 15 additions & 0 deletions eng/mgmt/AzSdk.test.reference.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<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.6, 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" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" PrivateAssets="All" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
<Version>1.0.0</Version>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\src\Microsoft.AzureStack.Management.Fabric.Admin.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
<Company>MSIT</Company>
<Copyright>Copyright © MSIT 2013</Copyright>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="[1.6.0-preview,2.0.0)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
<Version>1.0.0</Version>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\src\Microsoft.Azure.Management.Billing.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@ namespace Microsoft.Azure.Management.CognitiveServices.Models
/// A rule governing the accessibility from a specific ip address or ip
/// range.
/// </summary>
public partial class IpRule
public partial class IPRule
{
/// <summary>
/// Initializes a new instance of the IpRule class.
/// Initializes a new instance of the IPRule class.
/// </summary>
public IpRule()
public IPRule()
{
CustomInit();
}

/// <summary>
/// Initializes a new instance of the IpRule class.
/// Initializes a new instance of the IPRule class.
/// </summary>
/// <param name="value">An IPv4 address range in CIDR notation, such as
/// '124.56.78.91' (simple IP address) or '124.56.78.0/24' (all
/// addresses that start with 124.56.78).</param>
public IpRule(string value)
public IPRule(string value)
{
Value = value;
CustomInit();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.CognitiveServices.Models
using System.Linq;

/// <summary>
/// A set of rules governing the network accessibility.
/// A set of rules governing the network accessibility of a vault.
/// </summary>
public partial class NetworkRuleSet
{
Expand All @@ -42,7 +42,7 @@ public NetworkRuleSet()
/// <param name="ipRules">The list of IP address rules.</param>
/// <param name="virtualNetworkRules">The list of virtual network
/// rules.</param>
public NetworkRuleSet(string bypass = default(string), string defaultAction = default(string), IList<IpRule> ipRules = default(IList<IpRule>), IList<VirtualNetworkRule> virtualNetworkRules = default(IList<VirtualNetworkRule>))
public NetworkRuleSet(string bypass = default(string), string defaultAction = default(string), IList<IPRule> ipRules = default(IList<IPRule>), IList<VirtualNetworkRule> virtualNetworkRules = default(IList<VirtualNetworkRule>))
{
Bypass = bypass;
DefaultAction = defaultAction;
Expand Down Expand Up @@ -77,7 +77,7 @@ public NetworkRuleSet()
/// Gets or sets the list of IP address rules.
/// </summary>
[JsonProperty(PropertyName = "ipRules")]
public IList<IpRule> IpRules { get; set; }
public IList<IPRule> IpRules { get; set; }

/// <summary>
/// Gets or sets the list of virtual network rules.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,10 @@ public VirtualNetworkRule()
/// <param name="id">Full resource id of a vnet subnet, such as
/// '/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1'.</param>
/// <param name="state">Gets the state of virtual network rule.</param>
/// <param name="ignoreMissingVnetServiceEndpoint">Ignore missing vnet
/// service endpoint or not.</param>
public VirtualNetworkRule(string id, string state = default(string), bool? ignoreMissingVnetServiceEndpoint = default(bool?))
public VirtualNetworkRule(string id, string state = default(string))
{
Id = id;
State = state;
IgnoreMissingVnetServiceEndpoint = ignoreMissingVnetServiceEndpoint;
CustomInit();
}

Expand All @@ -61,12 +58,6 @@ public VirtualNetworkRule()
[JsonProperty(PropertyName = "state")]
public string State { get; set; }

/// <summary>
/// Gets or sets ignore missing vnet service endpoint or not.
/// </summary>
[JsonProperty(PropertyName = "ignoreMissingVnetServiceEndpoint")]
public bool? IgnoreMissingVnetServiceEndpoint { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,5 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_CognitiveServic
}.AsEnumerable();
}
}
// BEGIN: Code Generation Metadata Section
public static readonly String AutoRestVersion = "latest";
public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4283";
public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/cognitiveservices/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\\Github\\azure-sdk-for-net\\src\\SDKs";
public static readonly String GithubForkName = "Azure";
public static readonly String GithubBranchName = "master";
public static readonly String GithubCommidId = "f58c2f349207bda6f5ca4c010dd7f56c38ddb70e";
public static readonly String CodeGenerationErrors = "";
public static readonly String GithubRepoName = "azure-rest-api-specs";
// END: Code Generation Metadata Section
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<PropertyGroup>
<PackageId>Microsoft.Azure.Management.CognitiveServices</PackageId>
<Description>Microsoft Azure Management Cognitive Services Library</Description>
<Version>5.2.0</Version>
<Version>6.0.0-preview</Version>
<AssemblyName>Microsoft.Azure.Management.CognitiveServices</AssemblyName>
<PackageTags>Cognitive Services management;Cognitive Services;</PackageTags>
<PackageReleaseNotes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
<AssemblyName>Compute.Tests</AssemblyName>
<VersionPrefix>1.0.0-preview</VersionPrefix>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="4.2.0-preview" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
<Version>1.0.0</Version>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.6.0-preview" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
<Version>1.0.0</Version>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.6.0-preview" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<PropertyGroup>
<TargetFrameworks>$(SdkTargetFx)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
<PackageReference Include="System.Threading.Thread" Version="4.0.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
<Version>1.0.0</Version>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\src\Microsoft.Azure.Management.DataLake.Store.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
<Version>1.0.0</Version>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="1.2.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@
<PropertyGroup>
<TargetFrameworks>$(SdkTargetFx)</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
</PropertyGroup>
<Import Condition=" Exists('$([MSBuild]::GetPathOfFileAbove(AzSdk.RP.props))') " Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.RP.props'))" />
<!-- Please do not move/edit code above this line -->
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
<Version>1.0.0</Version>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.6.0-preview" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
<Version>1.0.0</Version>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\src\Microsoft.Azure.Management.NetApp.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
<Version>1.0.0</Version>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
</PropertyGroup>

<ItemGroup>
<!--<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.18.0-preview" />-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
<Version>1.0.0</Version>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup>
<ExcludeFromBuild>true</ExcludeFromBuild>
<ExcludeFromTest>true</ExcludeFromTest>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\src\Microsoft.Azure.Management.Reservations.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
<PropertyGroup>
<AzureApiTag>Features_2015-12-01;</AzureApiTag>
<AzureApiTag>Features_2015-12-01;ManagementLinkClient_2016-09-01;Resources_2016-09-01;Authorization_2016-09-01;Authorization_2018-05-01;Management_2018-05-01;PolicyClient_2018-05-01;Management_2019-05-01;ResourceManagementClient_2019-05-01;Resources_2019-05-01;SubscriptionClient_2016-06-01;</AzureApiTag>
<PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
</PropertyGroup>
</Project>
Loading

0 comments on commit e59953e

Please sign in to comment.