Skip to content
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

Use net6 previews for building #11545

Merged
merged 29 commits into from
Aug 4, 2021
Merged

Use net6 previews for building #11545

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
12d91c5
Use net6 previews for building
vzarytovskii May 11, 2021
80b73d3
Azure Pipelines: use dotnet version from global.json
vzarytovskii May 11, 2021
3428060
Merge upstream/main
vzarytovskii May 12, 2021
5e14280
Azure Pipelines: use explicit workind directory when installing .NET …
vzarytovskii May 12, 2021
b6b0037
Fixed framework version in build scripts
vzarytovskii May 13, 2021
79c00e1
Azure pipelines: revert the installation path change, and turn off th…
vzarytovskii May 13, 2021
c10665e
Azure pipelines: rollback to use explicit version in the yaml file, i…
vzarytovskii May 13, 2021
1168abe
Merged upstream/main
vzarytovskii May 13, 2021
65d3e19
Revert build script changes to framework version, we still target net…
vzarytovskii May 13, 2021
4d0bfb7
Bump arcade sdk version
vzarytovskii May 17, 2021
2ee9046
Merge upstream/main
vzarytovskii May 17, 2021
fb6e780
Added rollForward for compilerassert tests, and prerelease support fo…
vzarytovskii May 17, 2021
405a67e
Add runtimeconfig.json for cambridge tests
vzarytovskii May 17, 2021
6451a55
Addded global environment variable to roll to preview versions
vzarytovskii May 17, 2021
41ca0c0
Merge upstream/main
vzarytovskii May 21, 2021
0468f8c
Fix more tests
vzarytovskii May 21, 2021
30961cc
Fix more tests
vzarytovskii May 21, 2021
2c79ce5
Revert single-test framework resolution changes
vzarytovskii May 21, 2021
c99b2eb
Merge branch 'main' into net6
vzarytovskii Jul 12, 2021
9ab6d14
Merge upstream/main
vzarytovskii Jul 27, 2021
fdbaa8b
Merge upstream/main
vzarytovskii Jul 30, 2021
ffd0502
Update sdk version in the azure-pipelines.yml
vzarytovskii Jul 30, 2021
9e32d58
Emit 0n instead ldnull in nullPtr
vzarytovskii Jul 30, 2021
42d00f5
Specify type explicitly
vzarytovskii Jul 30, 2021
07dec5d
Fixed the MakeQueryableTake, and disabled tests for Array2D.set (as i…
vzarytovskii Aug 3, 2021
55af0c6
Disabled some more tests
vzarytovskii Aug 3, 2021
0c734eb
Disable whole array suite
vzarytovskii Aug 3, 2021
1dd0b02
Disable whole array suite
vzarytovskii Aug 3, 2021
7d87ecd
Restore tests, make them assert, there's no error, since it got fixed
vzarytovskii Aug 4, 2021
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
8 changes: 3 additions & 5 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ variables:
value: .NETCore
- name: VisualStudioDropName
value: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
- name: DotNetSdkVersion
value: '5.0.100'
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
- name: RunningAsPullRequest
value: true
Expand Down Expand Up @@ -370,7 +368,7 @@ stages:
# displayName: install SDK
# inputs:
# packageType: sdk
# version: $(DotNetSdkVersion)
# useGlobalJson: true
# installationPath: $(Agent.ToolsDirectory)/dotnet
# - script: dotnet build .\FSharp.sln /bl:\"artifacts/log/$(_BuildConfig)/RegularBuild.binlog\"
# displayName: Regular rebuild
Expand All @@ -393,7 +391,7 @@ stages:
displayName: install SDK
inputs:
packageType: sdk
version: $(DotNetSdkVersion)
useGlobalJson: true
installationPath: $(Agent.ToolsDirectory)/dotnet
- script: dotnet build ./FSharp.sln /bl:\"artifacts/log/$(_BuildConfig)/RegularBuild.binlog\"
displayName: Regular rebuild
Expand All @@ -416,7 +414,7 @@ stages:
displayName: install SDK
inputs:
packageType: sdk
version: $(DotNetSdkVersion)
useGlobalJson: true
installationPath: $(Agent.ToolsDirectory)/dotnet
- script: dotnet build ./FSharp.sln /bl:\"artifacts/log/$(_BuildConfig)/RegularBuild.binlog\"
displayName: Regular rebuild
Expand Down
5 changes: 3 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"sdk": {
"version": "5.0.100",
"version": "6.0.100-preview.3.21202.5",
"allowPrerelease": true,
"rollForward": "minor"
},
"tools": {
"dotnet": "5.0.100",
"dotnet": "6.0.100-preview.3.21202.5",
"vs": {
"version": "16.8",
"components": [
Expand Down