这是indexloc提供的服务,不要输入任何密码
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
71ab957
improve Peaky tests and environment configuration
jonsequitur Mar 29, 2024
f730def
prebuild console package at app startup
jonsequitur Mar 29, 2024
a54ee36
turn off HTTPS redirection
jonsequitur Apr 1, 2024
fdede36
remove empty cell
jonsequitur Apr 1, 2024
a017473
TrySetException
jonsequitur Apr 2, 2024
a2e508f
cleanup
jonsequitur Apr 2, 2024
8e0050f
improve integration test error output
jonsequitur Apr 2, 2024
ed4652a
remove integration test artifact output from Linux build
jonsequitur Apr 2, 2024
b36aaad
add PocketLogger to integration tests
jonsequitur Apr 4, 2024
3cbcbd6
make Linux integration tests go away
jonsequitur Apr 4, 2024
d428b48
publish all artifacts
jonsequitur Apr 4, 2024
092282d
logging improvements
jonsequitur Apr 4, 2024
4709d30
PocketLogger and logging updates
jonsequitur Apr 5, 2024
748b83c
fix warning
jonsequitur Apr 5, 2024
e07deae
remove separate screenshot publishing step
jonsequitur Apr 6, 2024
6edffd5
Merge branch 'main' into update-peaky-tests-and-add-build-controls
jonsequitur Apr 8, 2024
d21884a
disable PDB converter
jonsequitur Apr 8, 2024
e2035ab
Merge branch 'update-peaky-tests-and-add-build-controls' of https://g…
jonsequitur Apr 8, 2024
ffe90ed
don't publish to symbol server
jonsequitur Apr 8, 2024
8cdd517
update log path
jonsequitur Apr 8, 2024
315f228
Merge branch 'main' into update-peaky-tests-and-add-build-controls
jonsequitur Apr 8, 2024
971d447
remove symbol server parameters
jonsequitur Apr 8, 2024
de967b8
<PublishWindowsPdb>false</PublishWindowsPdb>
jonsequitur Apr 9, 2024
0bf6d68
turn on logging regardless of environment variable
jonsequitur Apr 9, 2024
56a0568
update Microsoft.DotNet.Interactive.CSharpProject version
jonsequitur Apr 9, 2024
ac7dcbf
update package versions
jonsequitur Apr 9, 2024
6f93235
Merge branch 'update-peaky-tests-and-add-build-controls' of https://g…
AbhitejJohn Apr 9, 2024
2e86361
One more shot at getting logs for tests.
AbhitejJohn Apr 9, 2024
5854c24
Setting pocket logger globally instead
AbhitejJohn Apr 10, 2024
b0644a8
Script to kill any remaining dotnet processes and also publish linux …
AbhitejJohn Apr 10, 2024
7cd5e52
Diagnostics for enabling logging for linux builds.
AbhitejJohn Apr 10, 2024
788626a
Enabling diagnostic logging from test platform.
AbhitejJohn Apr 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Developer-guide.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -376,11 +376,6 @@
"\n",
"The core of Try .NET is powered by the `CSharpProjectKernel`, which serves as the backend for .NET Interactive."
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": []
}
],
"metadata": {
Expand Down
3 changes: 2 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
<!-- private repo, don't do source-link -->
<DeterministicSourcePaths>false</DeterministicSourcePaths>
<EnableSourceLink>false</EnableSourceLink>

<PublishWindowsPdb>false</PublishWindowsPdb>

<!-- NuGet: A stable release of a package should not have a prerelease dependency. -->
<NoWarn>$(NoWarn);NU5104</NoWarn>
</PropertyGroup>
Expand Down
30 changes: 16 additions & 14 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,35 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="Assent" Version="2.3.2" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.3" />
<PackageVersion Include="Microsoft.DotNet.Interactive.CSharpProject" Version="1.0.0-beta.24168.2" />
<PackageVersion Include="Microsoft.Playwright" Version="1.41.2" />
<PackageVersion Include="peaky.client" Version="4.0.73" />
<PackageVersion Include="peaky.xunit" Version="4.0.73" />
<PackageVersion Include="Peaky" Version="4.0.77-beta" />
<PackageVersion Include="PocketLogger" Version="0.8.2" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.4" />
<PackageVersion Include="Microsoft.DotNet.Interactive.CSharpProject" Version="1.0.0-beta.24208.2" />
<PackageVersion Include="Microsoft.Playwright" Version="1.42.0" />
<PackageVersion Include="peaky.client" Version="4.0.79" />
<PackageVersion Include="peaky.xunit" Version="4.0.79" />
<PackageVersion Include="Peaky" Version="4.0.79-beta" />
<PackageVersion Include="Pocket.Disposable" Version="1.2.0" />
<PackageVersion Include="PocketLogger.For.Xunit" Version="0.9.0" />
<PackageVersion Include="PocketLogger.Subscribe" Version="0.9.0" />
<PackageVersion Include="PocketLogger" Version="0.9.0" />
<PackageVersion Include="Serilog.Sinks.RollingFileAlternate" Version="2.0.9" />
<PackageVersion Include="Serilog" Version="2.10.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageVersion Include="System.Drawing.Common" Version="8.0.3" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Reactive" Version="6.0.0" />
<PackageVersion Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
<PackageVersion Include="xunit" Version="2.7.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
<PackageVersion Include="xunit" Version="2.7.0" />
</ItemGroup>

<ItemGroup Condition="'$(DisableArcade)' == '1'">
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ COPY --from=build-env /App/out .

# Set up to run and expose app on port 80
EXPOSE 80
ENV ASPNETCORE_ENVIRONMENT=Production
ENV ASPNETCORE_URLS=http://*:80/

# This is a workaround for the fact that the Try .NET website is not yet container-aware
Expand Down
2 changes: 1 addition & 1 deletion PeakyTests.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"outputs": [],
"source": [
"var tests = await peakyClient.GetTestsAsync();\n",
"tests"
"tests.Display();"
]
},
{
Expand Down
40 changes: 12 additions & 28 deletions azure-pipelines-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ variables:
value: '8.0.101'
- name: NodeJSVersion
value: '16.13.0'
- name: PocketLoggerLogPath
value: $(Build.SourcesDirectory)/artifacts/logs/pocketlogger.log
- name: TryDotNetPackagesPath
value: $(Build.SourcesDirectory)/artifacts/.trydotnet/packages
- name: RunIntegrationTests
value: true
- name: Codeql.Enabled
value: true

Expand Down Expand Up @@ -86,23 +86,14 @@ extends:
outputParentDirectory: $(Build.SourcesDirectory)/artifacts
outputs:
- output: pipelineArtifact
targetPath: $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)
artifactName: Windows_test_results_and_dumps
displayName: Publish Test results and Blame dumps
condition: failed()
- output: pipelineArtifact
targetPath: $(Build.SourcesDirectory)/artifacts/bin/Microsoft.TryDotNet.IntegrationTests/$(_BuildConfig)/net8.0/playwright_screenshots
artifactName: Windows_playwright_screenshots
displayName: Publish Playwright screen shots
targetPath: $(Build.SourcesDirectory)/artifacts
artifactName: Windows_artifacts
displayName: Publish Windows artifacts
condition: always()
continueOnError: true
# Packages are not being generated
# - output: pipelineArtifact
# targetPath: $(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)
# artifactName: packages
# displayName: Publish packages to artifacts container

variables:
- name: RunIntegrationTests
value: true
# Enable signing for internal, non-PR builds
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- group: DotNet-Blob-Feed
Expand All @@ -122,10 +113,7 @@ extends:
/p:DotNetPublishToBlobFeed=true
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
/p:PublishToSymbolServer=true
# else
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
- name: _SignType
Expand Down Expand Up @@ -171,6 +159,7 @@ extends:
$(_TestArgs)
displayName: Build
env:
POCKETLOGGER_LOG_PATH: $(PocketLoggerLogPath)
TRYDOTNET_PACKAGES_PATH: $(TryDotNetPackagesPath)

- script: dotnet test -l trx --no-build --blame-hang-timeout 15m --blame-hang-dump-type full -c $(_BuildConfig) --results-directory $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)
Expand Down Expand Up @@ -204,16 +193,10 @@ extends:
outputParentDirectory: $(Build.SourcesDirectory)/artifacts
outputs:
- output: pipelineArtifact
targetPath: $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)
artifactName: Linux_test_results_and_dumps
displayName: Publish Test results and Blame dumps
condition: failed()
- output: pipelineArtifact
targetPath: $(Build.SourcesDirectory)/artifacts/bin/Microsoft.TryDotNet.IntegrationTests/$(_BuildConfig)/net8.0/playwright_screenshots
artifactName: Linux_playwright_screenshots
displayName: Publish Playwright screen shots
targetPath: $(Build.SourcesDirectory)/artifacts
artifactName: Linux_artifacts
displayName: Publish Linux artifacts
condition: always()
continueOnError: true
variables:
# Enable signing for internal, non-PR builds
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down Expand Up @@ -266,6 +249,7 @@ extends:
$(_TestArgs)
displayName: Build
env:
POCKETLOGGER_LOG_PATH: $(PocketLoggerLogPath)
TRYDOTNET_PACKAGES_PATH: $(TryDotNetPackagesPath)

- script: dotnet test -l trx --no-build --blame-hang-timeout 15m --blame-hang-dump-type full -c $(_BuildConfig) --results-directory $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)
Expand Down
72 changes: 33 additions & 39 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,10 @@ variables:
value: '16.13.0'
- name: TryDotNetPackagesPath
value: $(Build.SourcesDirectory)/artifacts/.trydotnet/packages
- name: RunIntegrationTests
value: true
- name: Codeql.Enabled
value: true

- name: system.debug
value: true
stages:
- stage: build
displayName: Build and Test
Expand All @@ -55,6 +54,10 @@ stages:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals windows.vs2022.amd64
variables:
- name: RunIntegrationTests
value: true
- name: POCKETLOGGER_LOG_PATH
value: $(Build.SourcesDirectory)\artifacts\logs\pocketlogger.log
# Enable signing for internal, non-PR builds
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- group: DotNet-Blob-Feed
Expand All @@ -74,10 +77,7 @@ stages:
/p:DotNetPublishToBlobFeed=true
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
/p:PublishToSymbolServer=true
# else
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
- name: _SignType
Expand Down Expand Up @@ -125,42 +125,29 @@ stages:
env:
TRYDOTNET_PACKAGES_PATH: $(TryDotNetPackagesPath)

- script: dotnet test -l trx --no-build --blame-hang-timeout 15m --blame-hang-dump-type full -c $(_BuildConfig) --results-directory $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)
- script: dotnet test -l trx --no-build --blame-hang-timeout 15m --blame-hang-dump-type full -c $(_BuildConfig) --results-directory $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig) --diag $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/diag.txt
displayName: Test / Blame
workingDirectory: $(Build.SourcesDirectory)
condition: ne(variables['SkipTests'], 'true')
env:
RunIntegrationTests: $(RunIntegrationTests)

- script: taskkill /f /im dotnet.exe
displayName: Cleaning up any stale dotnet.exe processes so log collection is possible.
condition: ne(variables['SkipTests'], 'true')

- pwsh: Get-ChildItem *.dmp -Recurse | Remove-Item
displayName: Delete dump files
workingDirectory: $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)
condition: and(ne(variables['KeepDumps'], 'true'), ne(variables['SkipTests'], 'true'))

- task: PublishBuildArtifacts@1
displayName: Publish Test results and Blame dumps
displayName: Publish Windows artifacts
inputs:
pathToPublish: $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)
artifactName: Windows_test_results_and_dumps
artifactType: container
condition: failed()

- task: PublishBuildArtifacts@1
displayName: Publish Playwright screen shots
inputs:
pathToPublish: $(Build.SourcesDirectory)\artifacts\bin\Microsoft.TryDotNet.IntegrationTests\Release\net8.0\playwright_screenshots
artifactName: Windows_playwright_screenshots
pathToPublish: $(Build.SourcesDirectory)/artifacts/
artifactName: Windows_artifacts
artifactType: container
condition: always()
continueOnError: true

# Packages are not being generated
# - task: PublishBuildArtifacts@1
# displayName: Publish packages to artifacts container
# inputs:
# pathToPublish: $(Build.SourcesDirectory)\artifacts\packages\$(_BuildConfig)
# artifactName: packages
# artifactType: container

- template: /eng/common/templates/jobs/jobs.yml
parameters:
Expand All @@ -174,6 +161,8 @@ stages:
pool:
vmImage: ubuntu-20.04
variables:
- name: POCKETLOGGER_LOG_PATH
value: $(Build.SourcesDirectory)/artifacts/logs/pocketlogger.log
# Enable signing for internal, non-PR builds
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- name: _SignType
Expand Down Expand Up @@ -219,6 +208,8 @@ stages:
Write-Host "##vso[task.setvariable variable=_TestArgs]$testArg"
displayName: Promote variables

- bash: echo $(POCKETLOGGER_LOG_PATH)

- script: ./eng/cibuild.sh
--configuration $(_BuildConfig)
--prepareMachine
Expand All @@ -227,34 +218,37 @@ stages:
env:
TRYDOTNET_PACKAGES_PATH: $(TryDotNetPackagesPath)

- script: dotnet test -l trx --no-build --blame-hang-timeout 15m --blame-hang-dump-type full -c $(_BuildConfig) --results-directory $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)
- script: dotnet test -l trx --no-build --blame-hang-timeout 15m --blame-hang-dump-type full -c $(_BuildConfig) --results-directory $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig) --diag $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/diag.txt
displayName: Test / Blame
workingDirectory: $(Build.SourcesDirectory)
condition: ne(variables['SkipTests'], 'true')
env:
RunIntegrationTests: $(RunIntegrationTests)

- pwsh: Stop-Process -Name dotnet -Force
displayName: Cleaning up any stale dotnet processes so log collection is possible.
condition: ne(variables['SkipTests'], 'true')

- pwsh: Get-ChildItem *.dmp -Recurse | Remove-Item
displayName: Delete dump files
workingDirectory: $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)
condition: and(ne(variables['KeepDumps'], 'true'), ne(variables['SkipTests'], 'true'))

- task: PublishBuildArtifacts@1
displayName: Publish Test results and Blame dumps
inputs:
pathToPublish: $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)
artifactName: Linux_test_results_and_dumps
artifactType: container
condition: failed()
# - task: PublishBuildArtifacts@1
# displayName: Publish Test results and Blame dumps
# inputs:
# pathToPublish: $(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)
# artifactName: Linux_test_results_and_dumps
# artifactType: container
# condition: failed()

- task: PublishBuildArtifacts@1
displayName: Publish Playwright screen shots
displayName: Publish Linux artifacts
inputs:
pathToPublish: $(Build.SourcesDirectory)/artifacts/bin/Microsoft.TryDotNet.IntegrationTests/Release/net8.0/playwright_screenshots
artifactName: Linux_playwright_screenshots
pathToPublish: $(Build.SourcesDirectory)/artifacts/
artifactName: Linux_artifacts
artifactType: container
condition: always()
continueOnError: true

#---------------------------------------------------------------------------------------------------------------------#
# Post Build #
Expand Down
1 change: 1 addition & 0 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<UsingToolNuGetRepack>true</UsingToolNuGetRepack>
<UsingToolXUnit>false</UsingToolXUnit>
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
<UsingToolPdbConverter>false</UsingToolPdbConverter>
<TestRunnerAdditionalArguments>-parallel none</TestRunnerAdditionalArguments>
</PropertyGroup>
<PropertyGroup>
Expand Down
Loading