Skip to content

Commit f40602f

Browse files
author
Hao Chen
committed
Merge pull request Azure#1527 from markcowl/fixresources
Fix issue with compiled resources and with new scenario test project
2 parents 5369b41 + 8f7a9d3 commit f40602f

15 files changed

+46
-16
lines changed

src/CLU/Commands.Common.Authentication/Authentication/AdalTokenProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
using Microsoft.Azure.Commands.Common.Authentication.Models;
1616
using System;
17-
using Microsoft.Azure.Commands.Common.Authentication.Properties;
17+
using Commands.Common.Authentication.Properties;
1818

1919
namespace Microsoft.Azure.Commands.Common.Authentication
2020
{

src/CLU/Commands.Common.Authentication/Authentication/ServicePrincipalTokenProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
using Microsoft.IdentityModel.Clients.ActiveDirectory;
1717
using Microsoft.Rest;
1818
using System;
19-
using Microsoft.Azure.Commands.Common.Authentication.Properties;
19+
using Commands.Common.Authentication.Properties;
2020

2121
namespace Microsoft.Azure.Commands.Common.Authentication
2222
{

src/CLU/Commands.Common.Authentication/Authentication/UserTokenProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using System.Runtime.InteropServices;
2020
using Microsoft.Rest.Azure.Authentication;
2121
using System.Management.Automation;
22-
using Microsoft.Azure.Commands.Common.Authentication.Properties;
22+
using Commands.Common.Authentication.Properties;
2323

2424
namespace Microsoft.Azure.Commands.Common.Authentication
2525
{

src/CLU/Commands.Common.Authentication/AuthenticationFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using Microsoft.IdentityModel.Clients.ActiveDirectory;
2020
using Microsoft.Rest;
2121
using Microsoft.Rest.Azure.Authentication;
22-
using Microsoft.Azure.Commands.Common.Authentication.Properties;
22+
using Commands.Common.Authentication.Properties;
2323

2424
namespace Microsoft.Azure.Commands.Common.Authentication.Factories
2525
{

src/CLU/Commands.Common.Authentication/ClientFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
using System.Net.Http;
2323
using System.Net.Http.Headers;
2424
using System.Reflection;
25-
using Microsoft.Azure.Commands.Common.Authentication.Properties;
25+
using Commands.Common.Authentication.Properties;
2626

2727
namespace Microsoft.Azure.Commands.Common.Authentication.Factories
2828
{

src/CLU/Commands.Common.Authentication/Commands.Common.Authentication.xproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
88
<PropertyGroup Label="Globals">
99
<ProjectGuid>4ce82310-d016-497d-93a0-0323a3e62064</ProjectGuid>
10-
<RootNamespace>Microsoft.Azure.Commands.Common.Authentication</RootNamespace>
10+
<RootNamespace>Commands.Common.Authentication</RootNamespace>
1111
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
1212
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
1313
</PropertyGroup>

src/CLU/Commands.Common.Authentication/JsonUtilities.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
using System;
1818
using System.Collections.Generic;
1919
using System.Diagnostics.CodeAnalysis;
20-
using Microsoft.Azure.Commands.Common.Authentication.Properties;
20+
using Commands.Common.Authentication.Properties;
2121

2222
namespace Microsoft.Azure.Commands.Common.Authentication
2323
{

src/CLU/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
using System;
1616
using System.Collections.Generic;
17-
using Microsoft.Azure.Commands.Common.Authentication.Properties;
17+
using Commands.Common.Authentication.Properties;
1818

1919
namespace Microsoft.Azure.Commands.Common.Authentication.Models
2020
{

src/CLU/Commands.Common.Authentication/Models/AzureSMProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
using System;
1818
using System.Collections.Generic;
1919
using System.Linq;
20-
using Microsoft.Azure.Commands.Common.Authentication.Properties;
20+
using Commands.Common.Authentication.Properties;
2121

2222
namespace Microsoft.Azure.Commands.Common.Authentication.Models
2323
{

src/CLU/Commands.Common.Authentication/Models/DiskDataStore.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
using System.IO;
1717
using System.Security.Cryptography.X509Certificates;
1818
using System.Text;
19-
using Microsoft.Azure.Commands.Common.Authentication.Properties;
19+
using Commands.Common.Authentication.Properties;
2020

2121
namespace Microsoft.Azure.Commands.Common.Authentication.Models
2222
{

src/CLU/Commands.Common.Authentication/Properties/Resources.Designer.cs

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/CLU/Commands.Common.Authentication/Properties/Resources.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<value>No certificate was found in the certificate store with thumbprint {0}</value>
125125
</data>
126126
<data name="ChangingDefaultEnvironmentNotSupported" xml:space="preserve">
127-
<value>Changing public environment is not supported.</value>
127+
<value>Changing a public environment is not supported.</value>
128128
</data>
129129
<data name="CredentialOrganizationIdMessage" xml:space="preserve">
130130
<value>-Credential parameter can only be used with Organization ID credentials. For more information, please refer to http://go.microsoft.com/fwlink/?linkid=331007&amp;clcid=0x409 for more information about the difference between an organizational account and a Microsoft account.</value>

src/CLU/Commands.Common.Authentication/Validate.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using System;
1616
using System.IO;
1717
using System.Linq;
18-
using Microsoft.Azure.Commands.Common.Authentication.Properties;
18+
using Commands.Common.Authentication.Properties;
1919

2020
namespace Microsoft.Azure.Commands.Common.Authentication
2121
{
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using System;
16+
using System.Collections.Generic;
17+
using System.Linq;
18+
using System.Threading.Tasks;
19+
20+
namespace Microsoft.Azure.Commands
21+
{
22+
public class EntryStub
23+
{
24+
public static void Main(string[] args)
25+
{
26+
// empty entry point
27+
}
28+
}
29+
}

src/CLU/Microsoft.ScenarioTests.CLU/project.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
},
1717
"dependencies": {
1818
"Microsoft.CLU": ""
19-
}
19+
},
20+
"compilationOptions": { "emitEntryPoint": true }
2021
}

0 commit comments

Comments
 (0)