Merge pull request #629 from santhoshb-msft/sb-release750update

updated install/upgrade to release mode and remove unused SupportMeteredBilling

Author: msalemcode

deployment/Deploy.ps1

@@ -305,13 +305,13 @@ if (!($ADMTApplicationID)) {
 Write-host "📜 Prepare publish files for the application"
 if (!(Test-Path '../Publish')) {		
 	Write-host "   🔵 Preparing Admin Site"  
-	dotnet publish ../src/AdminSite/AdminSite.csproj -c debug -o ../Publish/AdminSite/ -v q
+	dotnet publish ../src/AdminSite/AdminSite.csproj -c release -o ../Publish/AdminSite/ -v q
 
 	Write-host "   🔵 Preparing Metered Scheduler"
-	dotnet publish ../src/MeteredTriggerJob/MeteredTriggerJob.csproj -c debug -o ../Publish/AdminSite/app_data/jobs/triggered/MeteredTriggerJob/ -v q --runtime win-x64 --self-contained true 
+	dotnet publish ../src/MeteredTriggerJob/MeteredTriggerJob.csproj -c release -o ../Publish/AdminSite/app_data/jobs/triggered/MeteredTriggerJob/ -v q --runtime win-x64 --self-contained true 
 
 	Write-host "   🔵 Preparing Customer Site"
-	dotnet publish ../src/CustomerSite/CustomerSite.csproj -c debug -o ../Publish/CustomerSite/ -v q
+	dotnet publish ../src/CustomerSite/CustomerSite.csproj -c release -o ../Publish/CustomerSite/ -v q
 
 	Write-host "   🔵 Zipping packages"
 	Compress-Archive -Path ../Publish/AdminSite/* -DestinationPath ../Publish/AdminSite.zip -Force

deployment/Upgrade.ps1

@@ -92,11 +92,11 @@ Write-host "#### Database Deployment complete ####"
 
 Write-host "#### Deploying new code ####" 
 
-dotnet publish ../src/AdminSite/AdminSite.csproj -v q -c debug -o ../Publish/AdminSite/
+dotnet publish ../src/AdminSite/AdminSite.csproj -v q -c release -o ../Publish/AdminSite/
 Write-host "## Admin Portal built" 
-dotnet publish ../src/MeteredTriggerJob/MeteredTriggerJob.csproj -v q -c debug -o ../Publish/AdminSite/app_data/jobs/triggered/MeteredTriggerJob --runtime win-x64 --self-contained true 
+dotnet publish ../src/MeteredTriggerJob/MeteredTriggerJob.csproj -v q -c release -o ../Publish/AdminSite/app_data/jobs/triggered/MeteredTriggerJob --runtime win-x64 --self-contained true 
 Write-host "## Metered Scheduler to Admin Portal Built"
-dotnet publish ../src/CustomerSite/CustomerSite.csproj -v q -c debug -o ../Publish/CustomerSite
+dotnet publish ../src/CustomerSite/CustomerSite.csproj -v q -c release -o ../Publish/CustomerSite
 Write-host "## Customer Portal Built" 
 
 Compress-Archive -Path ../Publish/CustomerSite/* -DestinationPath ../Publish/CustomerSite.zip -Force
@@ -121,3 +121,5 @@ Write-host "## Deployed code to Customer Portal"
 
 Remove-Item -Path ../Publish -recurse -Force
 Write-host "#### Code deployment complete ####" 
+
+Write-host "#### Warning: If the upgrade is to >=7.5.0, MeterScheduler feature is pre-enabled through DB config instead of the App Service. Please update the App config accordingly. ####" 

src/AdminSite/Startup.cs

@@ -77,8 +77,7 @@ public void ConfigureServices(IServiceCollection services)
             Resource = this.Configuration["SaaSApiConfiguration:Resource"],
             SaaSAppUrl = this.Configuration["SaaSApiConfiguration:SaaSAppUrl"],
             SignedOutRedirectUri = this.Configuration["SaaSApiConfiguration:SignedOutRedirectUri"],
-            TenantId = this.Configuration["SaaSApiConfiguration:TenantId"] ?? Guid.Empty.ToString(),
-            SupportMeteredBilling = Convert.ToBoolean(this.Configuration["SaaSApiConfiguration:supportmeteredbilling"])
+            TenantId = this.Configuration["SaaSApiConfiguration:TenantId"] ?? Guid.Empty.ToString()
         };
         var knownUsers = new KnownUsersModel()
         {

src/AdminSite/appsettings.json

@@ -19,8 +19,7 @@
   //  "signedoutredirecturi": "",
   //  "fulfillmentapiversion": "2018-08-31",
   //  "adauthenticationendpoint": "https://login.microsoftonline.com",
-  //  "saasappurl": "",
-  //  "supportmeteredbilling": true
+  //  "saasappurl": ""
   //},
   //"connectionstrings": {
   //  "defaultconnection": ""

src/MeteredTriggerJob/Program.cs

@@ -36,8 +36,7 @@ static void Main (string[] args)
             ClientSecret = configuration["SaaSApiConfiguration:ClientSecret"],
             GrantType = configuration["SaaSApiConfiguration:GrantType"],
             Resource = configuration["SaaSApiConfiguration:Resource"],
-            TenantId = configuration["SaaSApiConfiguration:TenantId"],
-            SupportMeteredBilling = Convert.ToBoolean(configuration["SaaSApiConfiguration:SupportMeteredBilling"])
+            TenantId = configuration["SaaSApiConfiguration:TenantId"]
         };
 
         var creds = new ClientSecretCredential(config.TenantId.ToString(), config.ClientId.ToString(), config.ClientSecret);

src/MeteredTriggerJob/appsettings.json

@@ -6,8 +6,7 @@
     "clientid": "",
     "clientsecret": "",
     "resource": "",
-    "adauthenticationendpoint": "https://login.microsoftonline.com",
-    "supportmeteredbilling": true
+    "adauthenticationendpoint": "https://login.microsoftonline.com"
   },
   "connectionstrings": {
     "defaultconnection": ""

src/Services/Configurations/SaaSApiClientConfiguration.cs

@@ -96,14 +96,6 @@ public class SaaSApiClientConfiguration
     /// </value>
     public string SaaSAppUrl { get; set; }
 
-    /// <summary>
-    /// Gets or sets the saas metered billing support.
-    /// </summary>
-    /// <value>
-    /// True or false.
-    /// </value>
-    public bool SupportMeteredBilling { get; set; }
-
     /// <summary>
     /// Initializes or Gets the current run environment. Set to "development" or "production" is assumed.
     /// </summary>