Skip to content

Commit 70bde51

Browse files
jianghaolujianghaolu
committed
WebApp cmdlets dnx50
1 parent bb4781a commit 70bde51

File tree

5 files changed

+23
-16
lines changed

5 files changed

+23
-16
lines changed

‎src/CLU/CLUCoreCLR.sln

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Commands.ResourceManager.Co
1111
EndProject
1212
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Commands.Profile", "Microsoft.Azure.Commands.Profile\Microsoft.Azure.Commands.Profile.xproj", "{45B05B68-516F-4D74-897F-56D12894946C}"
1313
EndProject
14-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Commands.Websites", "Microsoft.Azure.Commands.Websites\Microsoft.Azure.Commands.Websites.xproj", "{F1A791BB-273E-446F-B9A1-6F8B9991F712}"
1514
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Commands.ResourceManager.Cmdlets", "Commands.ResourceManager.Cmdlets\Commands.ResourceManager.Cmdlets.xproj", "{D3F16CA7-CF23-4EBD-B70E-336D2D12415E}"
1615
EndProject
1716
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Commands.Profile.Test", "Microsoft.Azure.Commands.Profile.Test\Microsoft.Azure.Commands.Profile.Test.xproj", "{E267C25B-98EA-4872-9753-4F6B22F7CA24}"
@@ -21,6 +20,7 @@ EndProject
2120
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Commands.Resources", "Microsoft.Azure.Commands.Resources\Microsoft.Azure.Commands.Resources.xproj", "{99B1290D-A073-4907-8018-51C714431778}"
2221
EndProject
2322
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Commands.Resources.Test", "Microsoft.Azure.Commands.Resources.Test\Microsoft.Azure.Commands.Resources.Test.xproj", "{A9CC2879-D45D-4DCB-A405-6EEDB749B15F}"
23+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Commands.Websites", "Microsoft.Azure.Commands.Websites\Microsoft.Azure.Commands.Websites.xproj", "{E6F9ACF0-5BF3-423E-B9EB-983504B3FDCC}"
2424
EndProject
2525
Global
2626
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -44,10 +44,6 @@ Global
4444
{45B05B68-516F-4D74-897F-56D12894946C}.Debug|Any CPU.Build.0 = Debug|Any CPU
4545
{45B05B68-516F-4D74-897F-56D12894946C}.Release|Any CPU.ActiveCfg = Release|Any CPU
4646
{45B05B68-516F-4D74-897F-56D12894946C}.Release|Any CPU.Build.0 = Release|Any CPU
47-
{F1A791BB-273E-446F-B9A1-6F8B9991F712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48-
{F1A791BB-273E-446F-B9A1-6F8B9991F712}.Debug|Any CPU.Build.0 = Debug|Any CPU
49-
{F1A791BB-273E-446F-B9A1-6F8B9991F712}.Release|Any CPU.ActiveCfg = Release|Any CPU
50-
{F1A791BB-273E-446F-B9A1-6F8B9991F712}.Release|Any CPU.Build.0 = Release|Any CPU
5147
{D3F16CA7-CF23-4EBD-B70E-336D2D12415E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5248
{D3F16CA7-CF23-4EBD-B70E-336D2D12415E}.Debug|Any CPU.Build.0 = Debug|Any CPU
5349
{D3F16CA7-CF23-4EBD-B70E-336D2D12415E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -68,6 +64,10 @@ Global
6864
{A9CC2879-D45D-4DCB-A405-6EEDB749B15F}.Debug|Any CPU.Build.0 = Debug|Any CPU
6965
{A9CC2879-D45D-4DCB-A405-6EEDB749B15F}.Release|Any CPU.ActiveCfg = Release|Any CPU
7066
{A9CC2879-D45D-4DCB-A405-6EEDB749B15F}.Release|Any CPU.Build.0 = Release|Any CPU
67+
{E6F9ACF0-5BF3-423E-B9EB-983504B3FDCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68+
{E6F9ACF0-5BF3-423E-B9EB-983504B3FDCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
69+
{E6F9ACF0-5BF3-423E-B9EB-983504B3FDCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
70+
{E6F9ACF0-5BF3-423E-B9EB-983504B3FDCC}.Release|Any CPU.Build.0 = Release|Any CPU
7171
EndGlobalSection
7272
GlobalSection(SolutionProperties) = preSolution
7373
HideSolutionNode = FALSE

‎src/CLU/Microsoft.Azure.Commands.Websites/Cmdlets/WebApps/SetAzureWebApp.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
using Microsoft.Azure.Commands.WebApps.Utilities;
2323
using Microsoft.Azure.Commands.WebApps.Validations;
2424
using Microsoft.Azure.Management.WebSites.Models;
25-
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2625

2726
namespace Microsoft.Azure.Commands.WebApps.Cmdlets.WebApps
2827
{

‎src/CLU/Microsoft.Azure.Commands.Websites/Microsoft.Azure.Commands.Websites.xproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
88
<PropertyGroup Label="Globals">
9-
<ProjectGuid>f1a791bb-273e-446f-b9a1-6f8b9991f712</ProjectGuid>
9+
<ProjectGuid>e6f9acf0-5bf3-423e-b9eb-983504b3fdcc</ProjectGuid>
1010
<RootNamespace>Microsoft.Azure.Commands.Websites</RootNamespace>
1111
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
1212
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>

‎src/CLU/Microsoft.Azure.Commands.Websites/Models.WebApp/WebAppBaseClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public PSResourceManagerModels.ResourcesClient ResourcesClient
2828
{
2929
if (_resourcesClient == null)
3030
{
31-
_resourcesClient = new PSResourceManagerModels.ResourcesClient(ClientFactory, DefaultProfile.Context)
31+
_resourcesClient = new PSResourceManagerModels.ResourcesClient(ClientFactory, DefaultProfile.Context, DataStore)
3232
{
3333
VerboseLogger = WriteVerboseWithTimestamp,
3434
ErrorLogger = WriteErrorWithTimestamp,

‎src/CLU/Microsoft.Azure.Commands.Websites/project.json

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
{
22
"version": "1.0.0-*",
3-
"description": "Website Management Cmdlets",
4-
"authors": [ "markcowl" ],
3+
"description": "Microsoft Azure Website Manager Cmdlets",
4+
"authors": [ "markcowl, hovsepm, haocs" ],
55
"tags": [ "" ],
66
"projectUrl": "",
77
"licenseUrl": "",
88
"frameworks": {
99
"dnxcore50": {
1010
"dependencies": {
11-
"Microsoft.CLU": "1.0.0-*",
12-
"Microsoft.CSharp": "4.0.1-beta-23409",
13-
"System.Linq": "4.0.1-beta-23409"
11+
"Microsoft.NETCore": "5.0.1-beta-23516",
12+
"Microsoft.NETCore.Platforms": "1.0.1-beta-23516",
13+
"Microsoft.CSharp": "4.0.1-beta-23516"
1414
}
1515
}
1616
},
1717
"dependencies": {
1818
"Commands.Common.Authentication": "",
1919
"Commands.Common": "",
20-
"Commands.Common.Resources": "",
20+
"Commands.ResourceManager.Common": "",
21+
"Commands.ResourceManager.Cmdlets": "",
22+
"Microsoft.Azure.Commands.Resources": "",
23+
"Microsoft.Azure.Commands.Profile": "",
24+
"Microsoft.Azure.Graph.RBAC": "2.0.0-preview",
25+
"Microsoft.Azure.Management.Authorization": "2.0.1-preview",
2126
"Microsoft.Azure.Management.Resources": "3.1.1-preview",
2227
"Microsoft.Azure.Management.Websites": "1.0.0-preview",
2328
"Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.210231457-alpha",
@@ -38,7 +43,7 @@
3843
"System.Reflection.Extensions": "4.0.1-beta-23516",
3944
"System.Reflection.Primitives": "4.0.1-beta-23516",
4045
"System.Reflection.TypeExtensions": "4.1.0-beta-23516",
41-
"System.Runtime": "4.0.20",
46+
"System.Runtime": "4.0.21-beta-23516",
4247
"System.Runtime.Extensions": "4.0.11-beta-23409",
4348
"System.Runtime.Serialization.Json": "4.0.1-beta-23409",
4449
"System.Runtime.Serialization.Primitives": "4.1.0-beta-23516",
@@ -50,6 +55,9 @@
5055
"System.Threading": "4.0.11-beta-23409",
5156
"System.Threading.Tasks": "4.0.11-beta-23516",
5257
"System.Threading.Thread": "4.0.0-beta-23516",
53-
"System.Xml.ReaderWriter": "4.0.11-beta-23516"
58+
"System.Xml.ReaderWriter": "4.0.11-beta-23516",
59+
"System.Text.RegularExpressions": "4.0.11-beta-23516",
60+
"Microsoft.CLU": "1.0.0",
61+
"System.Linq": "4.0.1-beta-23409"
5462
}
5563
}

0 commit comments

Comments
 (0)