这是indexloc提供的服务，不要输入任何密码
Skip to content

[DO NOT MERGE] Install sdk 9 on agent #1248

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

Closed
wants to merge 5 commits into from
Closed

[DO NOT MERGE] Install sdk 9 on agent #1248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6782d71
update to net9.0
jonsequitur Jan 17, 2025
7bb67fa
update package versions
jonsequitur Jan 17, 2025
fedeef0
update path in script file for new TFM
jonsequitur Jan 18, 2025
88e7149
update azure-pipelines YAMLs to install .NET 9
jonsequitur Jan 23, 2025
70fc23a
Install .Net Sdk before running tests
ocalles Jan 23, 2025
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
14 changes: 7 additions & 7 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<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.24312.2" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.1" />
<PackageVersion Include="Microsoft.DotNet.Interactive.CSharpProject" Version="1.0.0-beta.25059.3" />
<PackageVersion Include="Microsoft.Playwright" Version="1.42.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="peaky.client" Version="4.0.79" />
Expand All @@ -20,11 +20,11 @@
<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="PocketLogger" Version="0.9.1" />
<PackageVersion Include="Serilog.Sinks.RollingFileAlternate" Version="2.0.9" />
<PackageVersion Include="Serilog" Version="3.1.1" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageVersion Include="System.Drawing.Common" Version="8.0.4" />
<PackageVersion Include="System.Drawing.Common" Version="9.0.1" />
<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" />
Expand Down
6 changes: 5 additions & 1 deletion azure-pipelines-CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,17 @@ extends:
- name: _BuildArgs
value: /p:SignType=$(_SignType)
steps:
- task: UseDotNet@2
Copy link
Contributor

@AbhitejJohn AbhitejJohn Jan 23, 2025

Choose a reason for hiding this comment

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

We might want to put this in the linux leg below as well. Would be easier if it was part of a common task list we can stick in all the jobs for all the other OSs.

displayName: Install SDK 9.0.102
inputs:
packageType: sdk
version: 9.0.102
- template: /eng/templates/build-and-test-job-windows-templates.yml@self
parameters:
buildConfig: $(_BuildConfig)
skipTests: $(SkipTests)
buildArgs: $(_BuildArgs)
additionalArgs: $(additionalWindowsArgs)

- template: /eng/common/templates-official/jobs/jobs.yml@self
parameters:
enableMicrobuild: true
Expand Down
6 changes: 5 additions & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,17 @@ stages:
- name: _BuildArgs
value: /p:SignType=$(_SignType)
steps:
- task: UseDotNet@2
displayName: Install SDK 9.0.102
inputs:
packageType: sdk
version: 9.0.102
Copy link
Contributor

@AbhitejJohn AbhitejJohn Jan 23, 2025

Choose a reason for hiding this comment

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

We might want to put this in the linux leg below as well. Would be easier if it was part of a common task list we can stick in all the jobs for all the other OSs.

- template: /eng/templates/build-and-test-job-windows-templates.yml@self
parameters:
buildConfig: $(_BuildConfig)
skipTests: $(SkipTests)
buildArgs: $(_BuildArgs)
additionalArgs: $(additionalWindowsArgs)

- task: PublishBuildArtifacts@1
displayName: Publish Windows artifacts
inputs:
Expand Down
2 changes: 1 addition & 1 deletion eng/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ try {

# playwright
if ($test) {
& $repoRoot\artifacts\bin\Microsoft.TryDotNet.IntegrationTests\$configuration\net8.0\playwright.ps1 install chromium
& $repoRoot\artifacts\bin\Microsoft.TryDotNet.IntegrationTests\$configuration\net9.0\playwright.ps1 install chromium
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "8.0.204",
"version": "9.0.102",
"allowPrerelease": true,
"rollForward": "latestMinor"
},
"tools": {
"dotnet": "8.0.204",
"dotnet": "9.0.102",
"rollForward": "latestMinor"
},
"msbuild-sdks": {
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TryDotNet.IntegrationTests/Microsoft.TryDotNet.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<Deterministic Condition="'$(NCrunch)' == '1'">false</Deterministic>
<GeneratedFileName>GeneratedLocation.cs</GeneratedFileName>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TryDotNet.SimulatorGenerator/Microsoft.TryDotNet.SimulatorGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<DebugType>embedded</DebugType>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TryDotNet.Tests/Microsoft.TryDotNet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PlaywrightPlatform>all</PlaywrightPlatform>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TryDotNet.WasmRunner/Microsoft.TryDotNet.WasmRunner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<StaticWebAssetBasePath>wasmrunner</StaticWebAssetBasePath>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TryDotNet/Microsoft.TryDotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>true</IsPackable>
Expand Down
Loading