Skip to content

Commit

Permalink
Merge branch 'release' of https://github.com/Azure/autorest into release
Browse files Browse the repository at this point in the history
  • Loading branch information
tbombach committed May 12, 2016
2 parents 7f90ee0 + a76ce51 commit 38aa357
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class AzureJavaCodeGenerator : JavaCodeGenerator
{
private readonly AzureJavaCodeNamer _namer;

private const string ClientRuntimePackage = "com.microsoft.rest:azure-client-runtime:0.0.1-SNAPSHOT";
private const string ClientRuntimePackage = "com.microsoft.rest:azure-client-runtime:1.0.0-SNAPSHOT from snapshot repo http://adxsnapshots.azurewebsites.net/";
private const string _packageInfoFileName = "package-info.java";

// page extensions class dictionary.
Expand Down
2 changes: 1 addition & 1 deletion AutoRest/Generators/Java/Java/JavaCodeGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Microsoft.Rest.Generator.Java
{
public class JavaCodeGenerator : CodeGenerator
{
private const string ClientRuntimePackage = "com.microsoft.rest:client-runtime:0.0.1-SNAPSHOT";
private const string ClientRuntimePackage = "com.microsoft.rest:client-runtime:1.0.0-SNAPSHOT from snapshot repo http://adxsnapshots.azurewebsites.net/";
private const string _packageInfoFileName = "package-info.java";

public JavaCodeNamer Namer { get; private set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace Microsoft.Rest.Generator.Azure.NodeJS
{
public class AzureNodeJSCodeGenerator : NodeJSCodeGenerator
{
private const string ClientRuntimePackage = "ms-rest-azure version 1.13.0";
private const string ClientRuntimePackage = "ms-rest-azure version 1.13.1";

// List of models with paging extensions.
private IList<PageTemplateModel> pageModels;
Expand Down
8 changes: 4 additions & 4 deletions ClientRuntimes/NodeJS/ms-rest-azure/lib/azureEnvironment.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ var supportedEnvironments = {
sqlManagementEndpointUrl: 'https://management.core.windows.net:8443/',
sqlServerHostnameSuffix: '.database.windows.net',
galleryEndpointUrl: 'https://gallery.azure.com/',
activeDirectoryEndpointUrl: 'https://login.microsoftonline.com',
activeDirectoryEndpointUrl: 'https://login.microsoftonline.com/',
activeDirectoryResourceId: 'https://management.core.windows.net/',
activeDirectoryGraphResourceId: 'https://graph.windows.net/',
activeDirectoryGraphApiVersion: '2013-04-05',
Expand All @@ -73,7 +73,7 @@ var supportedEnvironments = {
sqlManagementEndpointUrl: 'https://management.core.chinacloudapi.cn:8443/',
sqlServerHostnameSuffix: '.database.chinacloudapi.cn',
galleryEndpointUrl: 'https://gallery.chinacloudapi.cn/',
activeDirectoryEndpointUrl: 'https://login.chinacloudapi.cn',
activeDirectoryEndpointUrl: 'https://login.chinacloudapi.cn/',
activeDirectoryResourceId: 'https://management.core.chinacloudapi.cn/',
activeDirectoryGraphResourceId: 'https://graph.chinacloudapi.cn/',
activeDirectoryGraphApiVersion: '2013-04-05',
Expand All @@ -92,7 +92,7 @@ var supportedEnvironments = {
sqlManagementEndpointUrl: 'https://management.core.usgovcloudapi.net:8443/',
sqlServerHostnameSuffix: '.database.usgovcloudapi.net',
galleryEndpointUrl: 'https://gallery.usgovcloudapi.net/',
activeDirectoryEndpointUrl: 'https://login.microsoftonline.com',
activeDirectoryEndpointUrl: 'https://login.microsoftonline.com/',
activeDirectoryResourceId: 'https://management.core.usgovcloudapi.net/',
activeDirectoryGraphResourceId: 'https://graph.windows.net/',
activeDirectoryGraphApiVersion: '2013-04-05',
Expand All @@ -111,7 +111,7 @@ var supportedEnvironments = {
sqlManagementEndpointUrl: 'https://management.core.cloudapi.de:8443/',
sqlServerHostnameSuffix: '.database.cloudapi.de',
galleryEndpointUrl: 'https://gallery.cloudapi.de/',
activeDirectoryEndpointUrl: 'https://login.microsoftonline.de',
activeDirectoryEndpointUrl: 'https://login.microsoftonline.de/',
activeDirectoryResourceId: 'https://management.core.cloudapi.de/',
activeDirectoryGraphResourceId: 'https://graph.cloudapi.de/',
activeDirectoryGraphApiVersion: '2013-04-05',
Expand Down
2 changes: 1 addition & 1 deletion ClientRuntimes/NodeJS/ms-rest-azure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"email": "azsdkteam@microsoft.com",
"url": "https://github.com/Azure/AutoRest"
},
"version": "1.13.0",
"version": "1.13.1",
"description": "Client Runtime for Node.js Azure client libraries generated using AutoRest",
"tags": [ "node", "microsoft", "autorest", "azure", "clientruntime" ],
"keywords": [ "node", "microsoft", "autorest", "azure", "clientruntime" ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describe('AzureEnvironment', function() {
it('should show the details of Azure Production environment correctly', function(done) {
var tempEnv = msRestAzure.AzureEnvironment.Azure;
tempEnv.name.should.equal('Azure');
tempEnv.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.com');
tempEnv.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.com/');
tempEnv.activeDirectoryResourceId.should.equal('https://management.core.windows.net/');
tempEnv.managementEndpointUrl.should.equal('https://management.core.windows.net');
tempEnv.resourceManagerEndpointUrl.should.equal('https://management.azure.com/');
Expand All @@ -26,7 +26,7 @@ describe('AzureEnvironment', function() {
it('should show the details of Azure China environment correctly', function(done) {
var tempEnv = msRestAzure.AzureEnvironment.AzureChina;
tempEnv.name.should.equal('AzureChina');
tempEnv.activeDirectoryEndpointUrl.should.equal('https://login.chinacloudapi.cn');
tempEnv.activeDirectoryEndpointUrl.should.equal('https://login.chinacloudapi.cn/');
tempEnv.activeDirectoryResourceId.should.equal('https://management.core.chinacloudapi.cn/');
tempEnv.managementEndpointUrl.should.equal('https://management.core.chinacloudapi.cn');
tempEnv.resourceManagerEndpointUrl.should.equal('https://management.chinacloudapi.cn');
Expand All @@ -38,7 +38,7 @@ describe('AzureEnvironment', function() {
it('should show the details of Azure USGovernment environment correctly', function(done) {
var tempEnv = msRestAzure.AzureEnvironment.AzureUSGovernment;
tempEnv.name.should.equal('AzureUSGovernment');
tempEnv.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.com');
tempEnv.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.com/');
tempEnv.activeDirectoryResourceId.should.equal('https://management.core.usgovcloudapi.net/');
tempEnv.managementEndpointUrl.should.equal('https://management.core.usgovcloudapi.net');
tempEnv.resourceManagerEndpointUrl.should.equal('https://management.usgovcloudapi.net');
Expand All @@ -50,7 +50,7 @@ describe('AzureEnvironment', function() {
it('should show the details of Azure GermanCloud environment correctly', function(done) {
var tempEnv = msRestAzure.AzureEnvironment.AzureGermanCloud;
tempEnv.name.should.equal('AzureGermanCloud');
tempEnv.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.de');
tempEnv.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.de/');
tempEnv.activeDirectoryResourceId.should.equal('https://management.core.cloudapi.de/');
tempEnv.managementEndpointUrl.should.equal('https://management.core.cloudapi.de');
tempEnv.resourceManagerEndpointUrl.should.equal('https://management.microsoftazure.de');
Expand All @@ -65,13 +65,13 @@ describe('AzureEnvironment', function() {
portalUrl: 'http://go.microsoft.com/fwlink/?LinkId=254433',
managementEndpointUrl: 'https://management.core.windows.net',
resourceManagerEndpointUrl: 'https://management.azure.com/',
activeDirectoryEndpointUrl: 'https://login.microsoftonline.com',
activeDirectoryEndpointUrl: 'https://login.microsoftonline.com/',
activeDirectoryResourceId: 'https://management.core.windows.net/'
};
var tempEnv = msRestAzure.AzureEnvironment;
var dfood = tempEnv.add(df);
dfood.name.should.equal('Dogfood');
dfood.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.com');
dfood.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.com/');
dfood.activeDirectoryResourceId.should.equal('https://management.core.windows.net/');
dfood.managementEndpointUrl.should.equal('https://management.core.windows.net');
dfood.resourceManagerEndpointUrl.should.equal('https://management.azure.com/');
Expand All @@ -80,7 +80,7 @@ describe('AzureEnvironment', function() {

//Verify that the environment properly got added to the prototype
tempEnv.Dogfood.name.should.equal('Dogfood');
tempEnv.Dogfood.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.com');
tempEnv.Dogfood.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.com/');
tempEnv.Dogfood.activeDirectoryResourceId.should.equal('https://management.core.windows.net/');
tempEnv.Dogfood.managementEndpointUrl.should.equal('https://management.core.windows.net');
tempEnv.Dogfood.resourceManagerEndpointUrl.should.equal('https://management.azure.com/');
Expand Down

0 comments on commit 38aa357

Please sign in to comment.