Updated code to remove requirement of entityID

WAAD.WebSSO.ASPNET/csharp/code/libraries/powershell/Microsoft.Samples.Waad.PS/GetOrgIdSPN.cs

@@ -54,7 +54,7 @@
                     idpIdentifier = new Guid(entityDescriptor.Split('@')[1]);
                 }
 
-                return new GetOrgIdSpnResult(new Guid(this.AppPrincipalId), this.ApplicationDomain, idpIdentifier, entityDescriptor);
+                return new GetOrgIdSpnResult(new Guid(this.AppPrincipalId), this.ApplicationDomain, idpIdentifier);
             }
         }
     }

WAAD.WebSSO.ASPNET/csharp/code/libraries/powershell/Microsoft.Samples.Waad.PS/GetOrgIdSPNResult.cs

@@ -7,11 +7,11 @@
     {
         private const string Display = "<issuer name=\"{0}\" displayName=\"{0}\" realm=\"{1}\" />";
 
-        public GetOrgIdSpnResult(Guid appId, string appDomain, Guid idpId, string entityId)
+        public GetOrgIdSpnResult(Guid appId, string appDomain, Guid idpId)
         {
             this.ApplicationId = appId;
             this.ApplicationDomain = appDomain;
-            this.Spn = string.Format("spn:{0}@{1}", appId, idpId);
+            this.Spn = string.Format("spn:{0}@{1}", appId);
         }
 
         public Guid ApplicationId { get; internal set; }

WAAD.WebSSO.ASPNET/csharp/code/samples/OrgIdFederationSample/trustedIssuers.xml

@@ -1,8 +1,8 @@
 <issuers>
 	<issuer name="awesomecomputers.onmicrosoft.com" 
 			displayName="Awesome Computers" 
-			realm="spn:7829c758-2bef-43df-a685-717089474505@495c4a5e-38b7-49b9-a90f-4c0050b2d7f7" />
+			realm="spn:7829c758-2bef-43df-a685-71708947450" />
   <issuer name="treyresearchinc.onmicrosoft.com"
     displayName="Trey Research Inc."
-    realm="spn:7829c758-2bef-43df-a685-717089474505@13292593-4861-4847-8441-6da6751cfb86" />
+    realm="spn:7829c758-2bef-43df-a685-717089474505@" />
 </issuers>

WAAD.WebSSO.ASPNET/csharp/scripts/CreateServicePrincipal.ps1

@@ -101,5 +101,5 @@ $tenantId = (get-msolcompanyinformation).objectId
 "Company ID (you will need to put this in the portal): " + $tenantId
 "AppPrincipal ID(you will need to put this in the portal): " + $sp.AppPrincipalId
 if ($credType = "Asymmetric"){"App Principal Secret: " + $credValue}
-"Audience URI: " + $sp.AppPrincipalID + "@" + $tenantId
+"Audience URI: " + $sp.AppPrincipalID
 ""