Skip to content

Commit

Permalink
Merge branch 'master' into add-graphrbac
Browse files Browse the repository at this point in the history
  • Loading branch information
markcowl authored Apr 17, 2019
2 parents e2cecca + 299bf24 commit e88d579
Show file tree
Hide file tree
Showing 202 changed files with 31,765 additions and 2 deletions.
6 changes: 6 additions & 0 deletions Azure.PowerShell.Common.sln
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Strategies.Test", "src\Stra
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResourceManager.Test", "src\ResourceManager.Test\ResourceManager.Test.csproj", "{B571E523-6A04-4EFF-8E89-730078D7FBD1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monitor", "src\Monitor\Monitor.csproj", "{F27EF17C-CE35-4F25-8B6E-013FDE8B9761}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -107,6 +109,10 @@ Global
{B571E523-6A04-4EFF-8E89-730078D7FBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B571E523-6A04-4EFF-8E89-730078D7FBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B571E523-6A04-4EFF-8E89-730078D7FBD1}.Release|Any CPU.Build.0 = Release|Any CPU
{F27EF17C-CE35-4F25-8B6E-013FDE8B9761}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F27EF17C-CE35-4F25-8B6E-013FDE8B9761}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F27EF17C-CE35-4F25-8B6E-013FDE8B9761}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F27EF17C-CE35-4F25-8B6E-013FDE8B9761}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
45 changes: 45 additions & 0 deletions src/Monitor/Monitor.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(ProjectDir)..\Dependencies.Client.targets" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Microsoft.Azure.PowerShell.Clients.Monitor</AssemblyName>
<RootNamespace>Microsoft.Azure.Commands.Common.Monitor</RootNamespace>
<OutputPath>$(ProjectDir)..\..\artifacts\$(Configuration)</OutputPath>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsAsErrors />
</PropertyGroup>

<PropertyGroup>
<Title>Microsoft Azure PowerShell Clients Monitor</Title>
<Description>Microsoft Azure PowerShell Clients Monitor library. Only for use with the Azure PowerShell runtime. Not intended for general development use.</Description>
<PackageTags>azure;powershell;clients;monitor</PackageTags>
<Authors>Microsoft Corporation</Authors>
<Copyright>Copyright © Microsoft Corporation</Copyright>
<PackageLicenseUrl>https://aka.ms/azps-common-license</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/Azure/azure-powershell-common</PackageProjectUrl>
<PackageOutputPath>$(ProjectDir)..\..\artifacts\Package\$(Configuration)</PackageOutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>..\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
<DelaySign>false</DelaySign>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Security.SecureString" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
</ItemGroup>

</Project>
Loading

0 comments on commit e88d579

Please sign in to comment.