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.

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

[DO NOT MERGE] TFM net9.0 #850

Draft
wants to merge 64 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
37a66e7
net9.0
moljac Feb 21, 2024
f2ed288
net9.0 fixes
moljac Feb 21, 2024
daa9660
agent dotnet version
moljac Feb 21, 2024
bc9f982
Merge branch 'main' into mu-20240220-tfm-net90
moljac Feb 21, 2024
363a5e0
Update global.json
moljac Feb 21, 2024
524815e
Update build.yml
moljac Feb 21, 2024
fbb35bc
file renamed for net9.0
moljac Feb 22, 2024
b4c8f57
metadatq fixes
moljac Feb 22, 2024
934b8fa
nuget fixes
moljac Feb 22, 2024
300418d
Update build.cake
moljac Feb 22, 2024
d1cc416
Update build.cake
moljac Feb 23, 2024
667ce5f
Merge branch 'main' into mu-20240220-tfm-net90
moljac Feb 23, 2024
e9c8b21
Merge branch 'main' into mu-20240220-tfm-net90
moljac Feb 25, 2024
c644a41
added AndroidManifest.xml to the root of the project to fix errors
moljac Feb 25, 2024
0650707
renamed AndroidManifest.xml
moljac Feb 25, 2024
c1e6d88
Merge branch 'main' into mu-20240220-tfm-net90
moljac Mar 2, 2024
58c2447
Merge branch 'main' into mu-20240220-tfm-net90
moljac Mar 21, 2024
d7e1245
Merge branch 'main' into mu-20240220-tfm-net90
moljac Apr 13, 2024
854aaff
Merge branch 'main' into mu-20240220-tfm-net90
moljac Apr 19, 2024
70b1662
Merge branch 'main' into mu-20240220-tfm-net90
moljac May 1, 2024
7d585a2
Merge branch 'main' into mu-20240220-tfm-net90
moljac May 2, 2024
dec3a46
samples fixed
moljac May 7, 2024
54dbd73
Merge branch 'main' into mu-20240220-tfm-net90
moljac May 9, 2024
49ec27a
automatic files
moljac May 10, 2024
9149f8b
Merge branch 'main' into mu-20240220-tfm-net90
moljac May 17, 2024
d196b0c
Merge branch 'main' into mu-20240220-tfm-net90
moljac Jun 3, 2024
99b2121
Update published-namespaces.txt
moljac Jun 4, 2024
aed9564
Merge branch 'mu-20240220-tfm-net90' of https://github.com/xamarin/An…
moljac Jun 4, 2024
3960b42
Merge branch 'main' into mu-20240220-tfm-net90
moljac Jun 7, 2024
52882a5
bum dotnet to preview 9.0.100-preview.4
moljac Jun 7, 2024
fd39db8
automagic files
moljac Jun 7, 2024
c392d19
Merge branch 'mu-20240220-tfm-net90' of https://github.com/xamarin/An…
moljac Jun 7, 2024
19246ca
typos fixed
moljac Jun 7, 2024
d09a234
Update setup-environment.yml
moljac Jun 7, 2024
ed355f6
Merge branch 'main' into mu-20240220-tfm-net90
moljac Jun 12, 2024
c83ea9b
Merge branch 'main' into mu-20240220-tfm-net90
moljac Jun 14, 2024
69baef1
samples fixed
moljac Jun 15, 2024
abbb3d4
Merge branch 'main' into mu-20240220-tfm-net90
moljac Jun 30, 2024
24533e4
Merge branch 'main' into mu-20240220-tfm-net90
moljac Jul 8, 2024
03912f5
Merge branch 'main' into mu-20240220-tfm-net90
moljac Jul 13, 2024
dc17d44
automatic files
moljac Jul 21, 2024
855a04f
Merge branch 'mu-20240220-tfm-net90' of https://github.com/xamarin/An…
moljac Jul 21, 2024
3b29b6b
Merge branch 'main' into mu-20240220-tfm-net90
moljac Jul 30, 2024
f8cdfca
Merge branch 'main' into mu-20240220-tfm-net90
moljac Oct 1, 2024
e9e7ab3
"excludedRuntimeDependencies": "androidx.emoji2.emoji2"
moljac Oct 2, 2024
274234f
dotnet bump to 9.0.100-rc.1.24452.12
moljac Oct 3, 2024
eceaac5
dotnetVersion: '9.0.0-rc.1'
moljac Oct 3, 2024
4242b63
CI fixes
moljac Oct 3, 2024
332a4c3
sdk version fix
moljac Oct 3, 2024
5c82eee
parameters fixes
moljac Oct 3, 2024
e0dc83b
workloads.json
moljac Oct 3, 2024
e561931
Fix for Kotlin issue
jpobst Oct 3, 2024
3b36c85
Merge branch 'main' into mu-20240220-tfm-net90
moljac Oct 9, 2024
9d160bc
Merge branch 'main' into mu-20240220-tfm-net90
moljac Oct 10, 2024
daf9101
rc2
moljac Oct 11, 2024
a380608
metadata fixes
moljac Oct 11, 2024
9880350
Merge branch 'main' into mu-20240220-tfm-net90
moljac Oct 14, 2024
34d395f
Merge branch 'main' into mu-20240220-tfm-net90
moljac Oct 22, 2024
439714d
grpc fixes
moljac Oct 23, 2024
71da063
Merge branch 'main' into mu-20240220-tfm-net90
moljac Oct 23, 2024
9cca6d3
Merge branch 'main' into mu-20240220-tfm-net90
moljac Oct 26, 2024
abf1ffe
Merge branch 'main' into mu-20240220-tfm-net90
moljac Nov 14, 2024
221ffb2
Merge branch 'main' into mu-20240220-tfm-net90
moljac Dec 17, 2024
ea65769
Merge branch 'main' into mu-20240220-tfm-net90
moljac Dec 19, 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
11 changes: 5 additions & 6 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
<RepositoryCommit>$(BUILD_SOURCEVERSION)</RepositoryCommit>

<!-- Default TFM's we build for -->
<_DefaultTargetFrameworks>net8.0-android</_DefaultTargetFrameworks>
<_DefaultNetTargetFrameworks>net8.0</_DefaultNetTargetFrameworks>

<_DefaultTargetFrameworks>net9.0-android</_DefaultTargetFrameworks>
<_DefaultNetTargetFrameworks>net9.0</_DefaultNetTargetFrameworks>
<!-- Enable DIM/SIM for Classic (defaults to true on .NET) -->
<AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>

Expand Down Expand Up @@ -78,13 +77,13 @@

<!-- Folders that .targets files need to go into -->
<ItemGroup>
<AndroidXNuGetTargetFolders Include="build\net8.0-android34.0" />
<AndroidXNuGetTargetFolders Include="buildTransitive\net8.0-android34.0" />
<AndroidXNuGetTargetFolders Include="build\net9.0-android34.0" />
<AndroidXNuGetTargetFolders Include="buildTransitive\net9.0-android34.0" />
</ItemGroup>

<!-- Folders that _._ files need to go into for packages without managed libraries -->
<ItemGroup>
<AndroidXNuGetLibFolders Include="lib\net8.0-android34.0" />
<AndroidXNuGetLibFolders Include="lib\net9.0-android34.0" />
</ItemGroup>

<ItemGroup>
Expand Down
49 changes: 9 additions & 40 deletions build/ci/setup-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,46 +12,15 @@ steps:
includePreviewVersions: true
condition: ne('$(dotnetVersion)', '')

- ${{ if eq(parameters.runDotnetNextTest, true) }}:
- task: UseDotNet@2
displayName: 'Use dotnet $(dotnetNextVersion)'
inputs:
version: $(dotnetNextVersion)
performMultiLevelLookup: true
includePreviewVersions: true

- ${{ each tool in parameters.dotnetTools }}:
- ${{ each pair in tool }}:
- pwsh: dotnet tool update -g ${{ pair.key }} --version ${{ pair.value }}
displayName: 'Install tool: ${{ pair.key }}'

- ${{ if eq(parameters.runDotnetNextTest, true) }}:
- pwsh: |
dotnet cake -t=dotnet-next `
--dotnet-version="$(dotnetNextVersion)" `
--framework-version="$(dotnetNextFrameworkVersion)" `
--api-level-version="$(dotnetNextApiLevel)"
displayName: Set up dotnet-next test changes

- ${{ if eq(parameters.runDotnetNextTest, false) }}:
- pwsh: |
dotnet workload install maui --verbosity diag --from-rollback-file $(dotnetWorkloadRollbackFile) --source $(dotnetWorkloadSource) --source $(dotnetNuGetOrgSource)
if ($LASTEXITCODE -ne 0) {
Write-Host "##vso[task.logissue type=error]Failed to install workloads."
Write-Host "##vso[task.complete result=Failed;]"
exit 0
}
displayName: Install .NET Workloads

- ${{ if eq(parameters.runDotnetNextTest, true) }}:
- pwsh: |
dotnet workload install maui --verbosity diag
if ($LASTEXITCODE -ne 0) {
Write-Host "##vso[task.logissue type=error]Failed to install workloads."
Write-Host "##vso[task.complete result=Failed;]"
exit 0
}
displayName: Install Preview .NET Workloads
- pwsh: |
dotnet workload install android --verbosity diag --from-rollback-file $(dotnetWorkloadRollbackFile) --source $(dotnetWorkloadSource) --source $(dotnetNuGetOrgSource)
dotnet workload install maui --verbosity diag --from-rollback-file $(dotnetWorkloadRollbackFile) --source $(dotnetWorkloadSource) --source $(dotnetNuGetOrgSource)
if ($LASTEXITCODE -ne 0) {
Write-Host "##vso[task.logissue type=error]Failed to install workloads."
Write-Host "##vso[task.complete result=Failed;]"
exit 0
}
displayName: Install .NET Workloads

- bash: |
echo "##vso[task.setvariable variable=JAVA_HOME]/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home"
Expand Down
2 changes: 1 addition & 1 deletion build/ci/variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ variables:
macosAgentPoolName: VSEng-VSMac-Xamarin-Shared # macOS VM pool name

# Tool variables
dotnetVersion: '8.0.404' # .NET version to install on agent
dotnetVersion: '9.0.100' # .NET version to install on agent
dotnetWorkloadRollbackFile: 'workloads.json' # Rollback file specifying workload versions to install
dotnetNuGetOrgSource: 'https://api.nuget.org/v3/index.json' # NuGet.org URL to find workloads
dotnetWorkloadSource: 'https://aka.ms/dotnet6/nuget/index.json' # .NET engineering URL to find workloads
Expand Down
Loading
Loading