Updated GitHub action

riganti · Jul 14, 2024 · 6cab06d · 6cab06d
1 parent 8c433d6
commit 6cab06d
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 7 deletions.
diff --git a/.github/uitest/action.yml b/.github/uitest/action.yml
@@ -37,6 +37,7 @@ runs:
     shell: bash
     env:
       DOTVVM_SAMPLES_CONFIG_PROFILE: ${{ inputs.samples-config }}
+      GITHUB_TOKEN: ${{ inputs.github-token }}
 
   - if: ${{ runner.os == 'Windows' }}
     run: choco install dotnet-aspnetcoremodule-v2 -y
@@ -53,6 +54,7 @@ runs:
     shell: pwsh
     env:
       DOTVVM_SAMPLES_CONFIG_PROFILE: ${{ inputs.samples-config }}
+      GITHUB_TOKEN: ${{ inputs.github-token }}
 
   # publish the result to github
   - uses: ./.github/test-report

diff --git a/.github/uitest/uitest.ps1 b/.github/uitest/uitest.ps1
@@ -110,14 +110,16 @@ function Start-Sample {
         [int][parameter(Position = 2)]$port
     )
     Invoke-RequiredCmds "Start sample '$sampleName'" {
+		Reset-IISServerManager -Confirm:$false
+
         Remove-IISSite -Confirm:$false -Name $sampleName -ErrorAction SilentlyContinue
 
         icacls "$root\artifacts\" /grant "IIS_IUSRS:(OI)(CI)F"
 
         New-IISSite -Name "$sampleName" `
             -PhysicalPath "$path" `
             -BindingInformation "*:${port}:"
-
+		
         # ensure IIS created the site
         while ($true) {
             $state = (Get-IISSite -Name $sampleName).State
@@ -131,6 +133,15 @@ function Start-Sample {
                 throw "Site '${sampleName}' could not be started. State: '${state}'."
             }
         }
+
+		# add or update environment variable to the application pool
+		$existingEnvVar = c:\windows\system32\inetsrv\appcmd.exe list config -section:system.applicationHost/applicationPools `
+		     | out-string `
+			 | select-xml -XPath "//add[@name='DefaultAppPool']/environmentVariables/add[@name='GITHUB_TOKEN']"
+		if ($existingEnvVar -ne $null) {
+		    c:\windows\system32\inetsrv\appcmd.exe set config -section:system.applicationHost/applicationPools /-"[name='DefaultAppPool'].environmentVariables.[name='GITHUB_TOKEN']" /commit:apphost
+		}
+		c:\windows\system32\inetsrv\appcmd.exe set config -section:system.applicationHost/applicationPools /+"[name='DefaultAppPool'].environmentVariables.[name='GITHUB_TOKEN',value='$env:GITHUB_TOKEN']" /commit:apphost
     }
 }
 

diff --git a/src/Samples/Owin/DotVVM.Samples.BasicSamples.Owin.csproj b/src/Samples/Owin/DotVVM.Samples.BasicSamples.Owin.csproj
@@ -39,5 +39,6 @@
     <PackageReference Include="Microsoft.Owin" Version="4.2.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Owin" Version="1.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
   </ItemGroup>
 </Project>
diff --git a/src/Samples/Owin/Properties/launchSettings.json b/src/Samples/Owin/Properties/launchSettings.json
@@ -3,8 +3,8 @@
     "DotVVM.Samples.BasicSamples.Owin": {
       "commandName": "Project",
       "launchBrowser": true,
-      "launchUrl": "http://localhost:5407",
-      "applicationUrl": "http://localhost:5407",
+      "launchUrl": "http://localhost:65481/",
+      "applicationUrl": "http://localhost:65481/",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

diff --git a/src/Samples/Owin/Web.config b/src/Samples/Owin/Web.config
@@ -25,13 +25,13 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" culture="neutral" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
       </dependentAssembly>
     </assemblyBinding>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security" culture="neutral" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
       </dependentAssembly>
     </assemblyBinding>
@@ -49,9 +49,21 @@
     </assemblyBinding>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
+    </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4" />
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>