Merge branch 'main' of github.com:microsoft/metered-billing-accelerator

microsoft · May 2, 2024 · 4c510bc · 4c510bc
2 parents b0599c3 + e1e44ba
commit 4c510bc
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -372,6 +372,9 @@ setx.ex AZURE_METERING_MAX_DURATION_BETWEEN_SNAPSHOTS           00:05:00
 setx.exe WSLENV AZURE_METERING_MARKETPLACE_CLIENT_ID/u:AZURE_METERING_MARKETPLACE_CLIENT_SECRET/u:AZURE_METERING_MARKETPLACE_TENANT_ID/u:AZURE_METERING_INFRA_CLIENT_ID/u:AZURE_METERING_INFRA_CLIENT_SECRET/u:AZURE_METERING_INFRA_TENANT_ID/u:AZURE_METERING_INFRA_EVENTHUB_NAMESPACENAME/u:AZURE_METERING_INFRA_EVENTHUB_INSTANCENAME/u:AZURE_METERING_INFRA_CHECKPOINTS_CONTAINER/u:AZURE_METERING_INFRA_SNAPSHOTS_CONTAINER/u:AZURE_METERING_INFRA_CAPTURE_CONTAINER/u:AZURE_METERING_INFRA_CAPTURE_FILENAME_FORMAT/u:AZURE_METERING_MAX_NUMBER_OF_EVENTS_BETWEEN_SNAPSHOTS/u:AZURE_METERING_MAX_DURATION_BETWEEN_SNAPSHOTS/u
 ```
 
+> [!IMPORTANT]  
+> When you create the identity for the `AZURE_METERING_MARKETPLACE_CLIENT_ID`, please ensure that you not only have an 'app registration' here, but that this identity is a 'real' service principal. For example, when you [register a SaaS application](https://learn.microsoft.com/en-us/partner-center/marketplace/partner-center-portal/pc-saas-registration) in Azure marketplace, it must be a service principal (`ad ad sp create` in AZ CLI parlance).
+
 ## Supported deployment models
 
 The metering accelerator is planned for three distinct deployment models:
@@ -466,4 +469,4 @@ Any use of third-party trademarks or logos are subject to those third-party's po
 
 [folding]: https://en.wikipedia.org/wiki/Fold_(higher-order_function) "Fold (higher-order function) on Wikipedia"
 
-[Selecting the correct ID when submitting usage events to the Azure Marketplace Metered Billing API]: https://techcommunity.microsoft.com/t5/fasttrack-for-azure/azure-marketplace-metered-billing-picking-the-correct-id-when/ba-p/3542373
+[Selecting the correct ID when submitting usage events to the Azure Marketplace Metered Billing API]: https://techcommunity.microsoft.com/t5/fasttrack-for-azure/azure-marketplace-metered-billing-picking-the-correct-id-when/ba-p/3542373
diff --git a/src/Demos/SaaSIntegration/src/LandingPage/LandingPage.csproj b/src/Demos/SaaSIntegration/src/LandingPage/LandingPage.csproj
@@ -7,8 +7,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" NoWarn="NU1605" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.4" NoWarn="NU1605" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.17.4" />
-    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.17.4" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.17.4" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.18.1" />
+    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.18.1" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.18.1" />
   </ItemGroup>
 </Project>
diff --git a/src/Demos/SaaSIntegration/src/MeteredPage/MeteredPage.csproj b/src/Demos/SaaSIntegration/src/MeteredPage/MeteredPage.csproj
@@ -4,9 +4,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.4" NoWarn="NU1605" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.17.4" />
-    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.17.4" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.17.4" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.18.1" />
+    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.18.1" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.18.1" />
     <!--
     <PackageReference Include="Marketplace.SaaS.Client" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" NoWarn="NU1605" />

diff --git a/src/Metering.Runtime/Metering.Runtime.fsproj b/src/Metering.Runtime/Metering.Runtime.fsproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-    <PackageReference Include="Azure.Identity" Version="1.11.0" />
+    <PackageReference Include="Azure.Identity" Version="1.11.2" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
     <PackageReference Include="Azure.Messaging.EventHubs" Version="5.11.2" />
     <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.11.2" />

diff --git a/src/Metering.RuntimeCS/Metering.RuntimeCS.csproj b/src/Metering.RuntimeCS/Metering.RuntimeCS.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.11.0" />
+    <PackageReference Include="Azure.Identity" Version="1.11.2" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
     <PackageReference Include="Azure.Messaging.EventHubs" Version="5.11.2" />
     <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.11.2" />

diff --git a/src/Metering.SharedResourceBroker/Metering.SharedResourceBroker.csproj b/src/Metering.SharedResourceBroker/Metering.SharedResourceBroker.csproj
@@ -13,9 +13,9 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.4" />
     <PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.22.0" />
     <PackageReference Include="Microsoft.Graph.Communications.Core" Version="1.2.0.7270" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.17.4" />
-    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.17.4" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.17.4" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.18.1" />
+    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.18.1" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.18.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />