Skip to content

Merge master to staging branch #1972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manodasanW merged 16 commits into from
Apr 8, 2025
Merged

Merge master to staging branch #1972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4bdff1f
Migrate pipeline (#1957)
manodasanW Apr 2, 2025
5ff66cf
Don't throw if it isn't an object we can't release (#1958)
manodasanW Apr 2, 2025
49c009d
Fix signing location (#1960)
manodasanW Apr 2, 2025
efba9de
Enable NuGet Central Package Management
Apr 2, 2025
741d38c
Enable NuGet Central Package Management
Apr 2, 2025
107da67
Move to src folder
manodasanW Apr 3, 2025
23dbcf4
Central package management
manodasanW Apr 3, 2025
2225c97
Add TSA override (#1964)
manodasanW Apr 4, 2025
040e7d0
Improve CI build (#1966)
manodasanW Apr 7, 2025
521f591
Fix KeyValuePair pointer reuse issue from IInspectable getting dispos…
manodasanW Apr 8, 2025
a5ad16d
Merge branch 'master' into manodasanw/stagingmergenew
manodasanW Apr 8, 2025
3734834
Update package versions
manodasanW Apr 8, 2025
8dd2830
Merge central versioning
manodasanW Apr 8, 2025
f954ef8
Update version
manodasanW Apr 8, 2025
2ec1ffd
Fix build
manodasanW Apr 8, 2025
a720a4f
Update CsWinRT-Benchmarks-Steps.yml
manodasanW Apr 8, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .config/tsaoptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"projectName": "os"
}
58 changes: 16 additions & 42 deletions build/AzurePipelineTemplates/CsWinRT-Benchmarks-Steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,52 +10,35 @@ steps:
script: get_testwinrt.cmd
workingDirectory: $(Build.SourcesDirectory)\src

# Use .NET Core SDK 3.1
# Use .NET Core runtme 3.1
Copy link

Copilot AI Apr 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo in comment: 'runtme' should be corrected to 'runtime'.

Suggested change
# Use .NET Core runtme 3.1
# Use .NET Core runtime 3.1
Copilot uses AI. Check for mistakes.
- task: UseDotNet@2
displayName: Use .NET Core SDK 3.1
displayName: Use .NET Core runtime 3.1
inputs:
packageType: runtime
version: 3.1.x
installationPath: $(LocalAppData)\Microsoft\dotnet\
performMultiLevelLookup: true

# Use .NET Core runtime 6.0
- task: UseDotNet@2
displayName: Use .NET Core SDK 3.1
displayName: Use .NET Core runtime 6.0
inputs:
packageType: runtime
version: 3.1.x
installationPath: $(LocalAppData)\Microsoft\dotnet\x86\
performMultiLevelLookup: true
env:
PROCESSOR_ARCHITECTURE: x86
version: 6.x
installationPath: $(LocalAppData)\Microsoft\dotnet\

# Install .NET 8 SDK
- task: PowerShell@2
displayName: Install .NET 8 SDK
- task: UseDotNet@2
displayName: Use .NET Core SDK 8.0
inputs:
targetType: inline
failOnStderr: true
script: |
Write-Host ##vso[task.setvariable variable=PATH;]${env:LocalAppData}\Microsoft\dotnet;${env:PATH};

[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;

&([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) -Version "$($env:NET8_SDK_VERSION)" -Architecture "x64" -AzureFeed "$($env:NET5_SDK_FEED)"
packageType: sdk
version: 8.x
installationPath: $(LocalAppData)\Microsoft\dotnet\

# Install .NET 9 SDK
- task: PowerShell@2
displayName: Install .NET 9 SDK
- task: UseDotNet@2
displayName: Use .NET Core SDK 9.0
inputs:
targetType: inline
failOnStderr: true
script: |
Write-Host ##vso[task.setvariable variable=PATH;]${env:LocalAppData}\Microsoft\dotnet;${env:PATH};

[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;

dotnet new globaljson --sdk-version "$($env:NET9_SDK_VERSION)"

&([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) -Version "$($env:NET9_SDK_VERSION)" -Architecture "x64" -AzureFeed "$($env:NET5_SDK_FEED)"
packageType: sdk
version: 9.x
installationPath: $(LocalAppData)\Microsoft\dotnet\

# Verify .NET SDK
- task: CmdLine@2
Expand Down Expand Up @@ -83,12 +66,3 @@ steps:
# Component Detection
- task: ComponentGovernanceComponentDetection@0
displayName: Component Detection

# Stage Benchmark Results
- task: CopyFiles@2
displayName: Stage Benchmark Results
condition: always()
inputs:
SourceFolder: $(Build.SourcesDirectory)\src\BenchmarkDotNet.Artifacts\results\
Contents: '*'
TargetFolder: $(Build.ArtifactStagingDirectory)\benchmarks
Loading
Loading