SL-19854: Merge branch 'SL-19594' into actions-nat

secondlife · Jul 20, 2023 · 7aaf325 · 7aaf325
2 parents 3525e3d + 0c9bce9
commit 7aaf325
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/BugSplat/bin/SendPdbs.exe b/BugSplat/bin/SendPdbs.exe
diff --git a/BugSplat/bin/SendPdbs.exe.config b/BugSplat/bin/SendPdbs.exe.config
@@ -3,6 +3,10 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
+  <runtime>
+    <AppContextSwitchOverrides value="Switch.System.Net.DontEnableSchUseStrongCrypto=false" />
+    <AppContextSwitchOverrides value="Switch.System.Net.DontEnableSystemDefaultTlsVersions=false"/>
+  </runtime>
   <appSettings>
     <add key="AWSProfileName" value="BugSplat" />
     <add key="AWSRegion" value="us-east-1" />
@@ -20,4 +24,4 @@
       </providers>
     </roleManager>
   </system.web>
-</configuration>
+</configuration>
diff --git a/upload-windows-symbols.sh b/upload-windows-symbols.sh
@@ -36,7 +36,10 @@ then
          filelist+=("$reldir/secondlife-bin.exe")
      fi
 
-     args=(/a "$viewer_channel" \
+     # As of April 2023, we have a new SendPdbs.exe that will attempt to force
+     # use of TLS 1.2 (now required by the BugSplat servers) if you pass /x.
+     args=(/x \
+           /a "$viewer_channel" \
            /v "$version" \
            /b "$BUGSPLAT_DB" \
            /f "$(strjoin ';' "${filelist[@]}")")