Merge pull request #13 from Azure/main

Merge main into exception-logging
MJoshuaB · Oct 6, 2024 · 7e7256b · 7e7256b
2 parents 6a319b7 + a343b85
commit 7e7256b
Show file tree

Hide file tree

Showing 108 changed files with 15,385 additions and 10,644 deletions.
diff --git a/eng/common/TestResources/New-TestResources.ps1 b/eng/common/TestResources/New-TestResources.ps1
@@ -515,9 +515,9 @@ try {
 
     # Try to detect the shell based on the parent process name (e.g. launch via shebang).
     $shell, $shellExportFormat = if (($parentProcessName = (Get-Process -Id $PID).Parent.ProcessName) -and $parentProcessName -eq 'cmd') {
-        'cmd', 'set {0}={1}'
+        'cmd', 'set {0}=''{1}'''
     } elseif (@('bash', 'csh', 'tcsh', 'zsh') -contains $parentProcessName) {
-        'shell', 'export {0}={1}'
+        'shell', 'export {0}=''{1}'''
     } else {
         'PowerShell', '${{env:{0}}} = ''{1}'''
     }

diff --git a/eng/common/TestResources/deploy-test-resources.yml b/eng/common/TestResources/deploy-test-resources.yml
@@ -59,6 +59,21 @@ steps:
             ${{ parameters.SubscriptionConfiguration }}
           '@ | ConvertFrom-Json -AsHashtable;
 
+          $context = Get-AzContext
+          $subscriptionConfiguration["Environment"] = $context.Environment.Name
+          $subscriptionConfiguration["SubscriptionId"] = $context.Subscription.Id
+          $subscriptionConfiguration["TenantId"] = $context.Subscription.TenantId
+          $subscriptionConfiguration["TestApplicationId"] = $context.Account.Id
+          $subscriptionConfiguration["ProvisionerApplicationId"] = $context.Account.Id
+
+          $principal = Get-AzADServicePrincipal -ApplicationId $context.Account.Id
+          $subscriptionConfiguration["TestApplicationOid"] = $principal.Id
+          $subscriptionConfiguration["ProvisionerApplicationOid"] = $principal.Id
+
+          Write-Host ($subscriptionConfiguration | ConvertTo-Json)
+          # Write the new SubscriptionConfiguration to be used by the remove test resources
+          Write-Host "##vso[task.setvariable variable=SubscriptionConfiguration;]$($subscriptionConfiguration | ConvertTo-Json -Compress)"
+
           # The subscriptionConfiguration may have ArmTemplateParameters defined, so
           # pass those in via the ArmTemplateParameters flag, and handle any
           # additional parameters from the pipelines via AdditionalParameters

diff --git a/eng/pipelines/templates/steps/sdk-testgen-set-env.yml b/eng/pipelines/templates/steps/sdk-testgen-set-env.yml
diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/pages/index.scss b/src/dotnet/APIView/APIViewWeb/Client/css/pages/index.scss
@@ -7,6 +7,8 @@
 }
 
 #reviews-table {
+    color: var(--base-text-color);
+
     td {
         white-space: nowrap;
         overflow: hidden;
@@ -25,8 +27,6 @@
     .cst-bdr-left {
         border-left: 1px solid var(--border-color);
     }
-
-    color: var(--base-text-color);
 }
 
 #reviews-table-container {

diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/shared/comments.scss b/src/dotnet/APIView/APIViewWeb/Client/css/shared/comments.scss
@@ -96,12 +96,11 @@
 }
 
 .review-comment {
+    padding: 4px 16px;
+    position: relative;
     pre {
         background-color: var(--base-bg-color);
     }
-
-    padding: 4px 16px;
-    position: relative;
 }
 
 .review-comment:first-child {

diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/shared/language-customizations.scss b/src/dotnet/APIView/APIViewWeb/Client/css/shared/language-customizations.scss
@@ -8,230 +8,230 @@
 
 .java-variant {
     &.icon-assembly {
-        background: url(/icons/java/common/assembly.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/assembly.svg) center left no-repeat !important;
     }
 
     &.icon-gradle {
-        background: url(/icons/java/common/gradle.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/gradle.svg) center left no-repeat !important;
     }
 
     &.icon-maven {
-        background: url(/icons/java/common/maven.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/maven.svg) center left no-repeat !important;
     }
 
     &.icon-namespace {
-        background: url(/icons/java/common/namespace.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/namespace.svg) center left no-repeat !important;
     }
 
     &.icon-spring {
-        background: url(/icons/java/common/spring.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/spring.svg) center left no-repeat !important;
     }
 
     &.icon-unknown {
-        background: url(/icons/java/common/unknown.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/unknown.svg) center left no-repeat !important;
     }
 
     &.icon-android {
-        background: url(/icons/java/common/android.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/android.svg) center left no-repeat !important;
     }
 
     &.icon-annotation {
-        background: url(/icons/java/java/annotation.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/java/annotation.svg) center left no-repeat !important;
     }
 
     &.icon-class {
-        background: url(/icons/java/java/class.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/java/class.svg) center left no-repeat !important;
     }
 
     &.icon-enum {
-        background: url(/icons/java/java/enum.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/java/enum.svg) center left no-repeat !important;
     }
 
     &.icon-interface {
-        background: url(/icons/java/java/interface.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/java/interface.svg) center left no-repeat !important;
     }
 
     &.icon-module {
-        background: url(/icons/java/common/module.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/module.svg) center left no-repeat !important;
     }
 }
 
 .kotlin-variant {
     &.icon-assembly {
-        background: url(/icons/java/common/assembly.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/assembly.svg) center left no-repeat !important;
     }
 
     &.icon-gradle {
-        background: url(/icons/java/common/gradle.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/gradle.svg) center left no-repeat !important;
     }
 
     &.icon-maven {
-        background: url(/icons/java/common/maven.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/maven.svg) center left no-repeat !important;
     }
 
     &.icon-namespace {
-        background: url(/icons/java/common/namespace.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/namespace.svg) center left no-repeat !important;
     }
 
     &.icon-spring {
-        background: url(/icons/java/common/spring.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/spring.svg) center left no-repeat !important;
     }
 
     &.icon-unknown {
-        background: url(/icons/java/common/unknown.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/unknown.svg) center left no-repeat !important;
     }
 
     &.icon-android {
-        background: url(/icons/java/common/android.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/android.svg) center left no-repeat !important;
     }
 
     &.icon-annotation {
-        background: url(/icons/java/kotlin/annotation.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/kotlin/annotation.svg) center left no-repeat !important;
     }
 
     &.icon-class {
-        background: url(/icons/java/kotlin/class.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/kotlin/class.svg) center left no-repeat !important;
     }
 
     &.icon-enum {
-        background: url(/icons/java/kotlin/enum.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/kotlin/enum.svg) center left no-repeat !important;
     }
 
     &.icon-interface {
-        background: url(/icons/java/kotlin/interface.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/kotlin/interface.svg) center left no-repeat !important;
     }
 
     &.icon-function {
-        background: url(/icons/java/kotlin/function.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/kotlin/function.svg) center left no-repeat !important;
     }
 
     &.icon-kotlinLanguage {
-        background: url(/icons/java/kotlin/kotlinLanguage.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/kotlin/kotlinLanguage.svg) center left no-repeat !important;
     }
 
     &.icon-object {
-        background: url(/icons/java/kotlin/object.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/kotlin/object.svg) center left no-repeat !important;
     }
 
     &.icon-property {
-        background: url(/icons/java/kotlin/property.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/kotlin/property.svg) center left no-repeat !important;
     }
 
     &.icon-module {
-        background: url(/icons/java/common/module.svg) center left no-repeat !important;
+        background: url(~@wwwroot/icons/java/common/module.svg) center left no-repeat !important;
     }
 }
 
 .c-variant, .cplusplus-variant, .csharp-variant, .go-variant, .javascript-variant, .json-variant, .python-variant, .swagger-variant, .swift-variant, .xml-variant {
     &.icon-class {
-        background: url(/icons/class.png) center left no-repeat;
+        background: url(~@wwwroot/icons/class.png) center left no-repeat;
     }
 
     &.icon-interface {
-        background: url(/icons/interface.png) center left no-repeat;
+        background: url(~@wwwroot/icons/interface.png) center left no-repeat;
     }
 
     &.icon-struct {
-        background: url(/icons/struct.png) center left no-repeat;
+        background: url(~@wwwroot/icons/struct.png) center left no-repeat;
     }
 
     &.icon-enum {
-        background: url(/icons/enum.png) center left no-repeat;
+        background: url(~@wwwroot/icons/enum.png) center left no-repeat;
     }
 
     &.icon-delegate {
-        background: url(/icons/delegate.png) center left no-repeat;
+        background: url(~@wwwroot/icons/delegate.png) center left no-repeat;
     }
 
     &.icon-unknown {
-        background: url(/icons/type.png) center left no-repeat;
+        background: url(~@wwwroot/icons/type.png) center left no-repeat;
     }
 
     &.icon-assembly {
-        background: url(/icons/assembly.png) center left no-repeat;
+        background: url(~@wwwroot/icons/assembly.png) center left no-repeat;
     }
 
     &.icon-namespace {
-        background: url(/icons/namespace.png) center left no-repeat;
+        background: url(~@wwwroot/icons/namespace.png) center left no-repeat;
     }
 
     &.icon-package {
-        background: url(/icons/package.png) center left no-repeat;
+        background: url(~@wwwroot/icons/package.png) center left no-repeat;
     }
 
     &.icon-method {
-        background: url(/icons/method.png) center left no-repeat;
+        background: url(~@wwwroot/icons/method.png) center left no-repeat;
     }
 }
 
 .icon-csharp {
     @extend .icon-language;
-    background: url(/icons/csharp-original.svg) center no-repeat;
+    background: url(~@wwwroot/icons/csharp-original.svg) center no-repeat;
 }
 
 .icon-javascript {
     @extend .icon-language;
-    background: url(/icons/javascript-original.svg) center no-repeat;
+    background: url(~@wwwroot/icons/javascript-original.svg) center no-repeat;
 }
 
 .icon-python {
     @extend .icon-language;
-    background: url(/icons/python-original.svg) center no-repeat;
+    background: url(~@wwwroot/icons/python-original.svg) center no-repeat;
 }
 
 .icon-c {
     @extend .icon-language;
-    background: url(/icons/c-original.svg) center no-repeat;
+    background: url(~@wwwroot/icons/c-original.svg) center no-repeat;
 }
 
 .icon-cplusplus {
     @extend .icon-language;
-    background: url(/icons/cplusplus-original.svg) center no-repeat;
+    background: url(~@wwwroot/icons/cplusplus-original.svg) center no-repeat;
 }
 
 .icon-go {
     @extend .icon-language;
-    background: url(/icons/go-original.svg) center no-repeat;
+    background: url(~@wwwroot/icons/go-original.svg) center no-repeat;
 }
 
 .icon-java {
     @extend .icon-language;
-    background: url(/icons/java-original.svg) center no-repeat;
+    background: url(~@wwwroot/icons/java-original.svg) center no-repeat;
 }
 
 .icon-java-spring {
     @extend .icon-language;
-    background: url(/icons/java-spring-original.svg) center no-repeat;
+    background: url(~@wwwroot/icons/java-spring-original.svg) center no-repeat;
 }
 
 .icon-java-android {
     @extend .icon-language;
-    background: url(/icons/java-android-original.svg) center no-repeat;
+    background: url(~@wwwroot/icons/java-android-original.svg) center no-repeat;
 }
 
 .icon-swift {
     @extend .icon-language;
-    background: url(/icons/swift-original.svg) center no-repeat;
+    background: url(~@wwwroot/icons/swift-original.svg) center no-repeat;
 }
 
 .icon-kotlin {
     @extend .icon-language;
-    background: url(/icons/kotlin-original.svg) center no-repeat;
+    background: url(~@wwwroot/icons/kotlin-original.svg) center no-repeat;
 }
 
 .icon-json {
     @extend .icon-language;
-    background: url(/icons/json-original.svg) center no-repeat;
+    background: url(~@wwwroot/icons/json-original.svg) center no-repeat;
 }
 
 .icon-swagger {
     @extend .icon-language;
-    background: url(/icons/swagger-original.svg) center no-repeat;
+    background: url(~@wwwroot/icons/swagger-original.svg) center no-repeat;
 }
 
 .icon-typespec {
     @extend .icon-language;
-    background: url(/icons/typespec-original.svg) center center no-repeat;
+    background: url(~@wwwroot/icons/typespec-original.svg) center center no-repeat;
 }
 
 .icon-comments {
@@ -242,9 +242,9 @@
 }
 
 .icon-chevron-right {
-    background: url(/icons/chevron-right.svg) center no-repeat;
+    background: url(~@wwwroot/icons/chevron-right.svg) center no-repeat;
 }
 
 .icon-chevron-up {
-    background: url(/icons/chevron-up.svg) center no-repeat;
+    background: url(~@wwwroot/icons/chevron-up.svg) center no-repeat;
 }
diff --git a/src/dotnet/APIView/APIViewWeb/Client/css/shared/mixins.scss b/src/dotnet/APIView/APIViewWeb/Client/css/shared/mixins.scss
@@ -72,6 +72,8 @@
     color: var(--navbar-text);
     padding-top : 0px;
     padding-bottom : 0px;
+    border-bottom: 1px solid var(--border-color);
+    z-index: 2;
 
     a:hover {
         text-decoration: none;
@@ -84,9 +86,6 @@
     a:hover, a:active {
         color: var(--navbar-link-active);
     }
-
-    border-bottom: 1px solid var(--border-color);
-    z-index: 2;
 }
 
 @mixin apiview-logo {