Skip to content

Commit 6bd1b0e

Browse files
Download and include runtime packs
This allows us to completely get rid of NuGet.config files for `samples.sln`.
1 parent 77720d2 commit 6bd1b0e

File tree

6 files changed

+40
-27
lines changed

6 files changed

+40
-27
lines changed

Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
<PackageVersion>0.1.0-alpha1</PackageVersion>
55
<DotNetVersionBand>6.0.100</DotNetVersionBand>
66
<DotNetVersion>$(DotNetVersionBand)-preview.1.21103.13</DotNetVersion>
7+
<!-- After bumping $(DotNetVersion) find this version in bin/dotnet/sdk/*/dotnet.runtimeconfig.json -->
8+
<DotNetRuntimeVersion>6.0.0-preview.1.21102.12</DotNetRuntimeVersion>
79
<MicrosoftAndroidVersion>11.0.200-ci.master.85</MicrosoftAndroidVersion>
810
<MicrosoftiOSVersion>14.3.100-ci.main.1079</MicrosoftiOSVersion>
11+
912
<!-- Paths -->
1013
<MauiOutputPath>$(MSBuildThisFileDirectory)bin/</MauiOutputPath>
1114
<DotNetDirectory>$(MauiOutputPath)dotnet/</DotNetDirectory>

samples/nuget.config

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/DotNet.Toolchain/DotNet.Toolchain.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
_DownloadDotNetInstallScript;
66
_InstallDotNet;
77
_AcquireWorkloads;
8-
_AcquireSdks;
8+
_AcquirePacks;
99
_CreateWorkloadSentinel;
1010
</_ProvisionDependsOn>
1111
</PropertyGroup>
@@ -47,11 +47,11 @@
4747
<RemoveDir Directories="@(_WorkloadDirectoriesToDelete);$(DotNetSdkManifestsDirectory)Microsoft.Build.NoTargets" />
4848
<Touch Files="$(DotNetSdkManifestsDirectory).stamp" AlwaysCreate="true" />
4949
</Target>
50-
<Target Name="_AcquireSdks"
51-
Inputs="$(MSBuildAllProjects);../Maui.Dependencies/Maui.Dependencies.Sdks.csproj"
50+
<Target Name="_AcquirePacks"
51+
Inputs="$(MSBuildAllProjects);../Maui.Dependencies/Maui.Dependencies.Packs.csproj"
5252
Outputs="$(DotNetPacksDirectory).stamp">
5353
<Exec
54-
Command="&quot;$(DotNetToolPath)&quot; build &quot;$(MSBuildThisFileDirectory)../Maui.Dependencies/Maui.Dependencies.Sdks.csproj&quot; -bl:../../bin/Maui.Dependencies.Sdks.binlog"
54+
Command="&quot;$(DotNetToolPath)&quot; build &quot;$(MSBuildThisFileDirectory)../Maui.Dependencies/Maui.Dependencies.Packs.csproj&quot; -bl:../../bin/Maui.Dependencies.Packs.binlog"
5555
EnvironmentVariables="NUGET_PACKAGES=$(DotNetPacksDirectory)"
5656
/>
5757
<RemoveDir Directories="$(DotNetPacksDirectory)Microsoft.Build.NoTargets" />
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<Project Sdk="Microsoft.Build.NoTargets">
2+
<PropertyGroup>
3+
<TargetFramework>net6.0</TargetFramework>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<!-- SDK packs-->
7+
<PackageDownload Include="Microsoft.Android.Ref" Version="[$(MicrosoftAndroidVersion)]" />
8+
<PackageDownload Include="Microsoft.Android.Sdk.win-x64" Version="[$(MicrosoftAndroidVersion)]" Condition="$([MSBuild]::IsOSPlatform('windows'))" />
9+
<PackageDownload Include="Microsoft.Android.Sdk.osx-x64" Version="[$(MicrosoftAndroidVersion)]" Condition="$([MSBuild]::IsOSPlatform('osx'))" />
10+
<PackageDownload Include="Microsoft.Android.Sdk.BundleTool" Version="[$(MicrosoftAndroidVersion)]" />
11+
<PackageDownload Include="Microsoft.iOS.Ref" Version="[$(MicrosoftiOSVersion)]" />
12+
<PackageDownload Include="Microsoft.iOS.Sdk" Version="[$(MicrosoftiOSVersion)]" />
13+
14+
<!-- Runtime packs -->
15+
<PackageDownload Include="Microsoft.Android.Runtime.android.21-arm" Version="[$(MicrosoftAndroidVersion)]" />
16+
<PackageDownload Include="Microsoft.Android.Runtime.android.21-arm64" Version="[$(MicrosoftAndroidVersion)]" />
17+
<PackageDownload Include="Microsoft.Android.Runtime.android.21-x86" Version="[$(MicrosoftAndroidVersion)]" />
18+
<PackageDownload Include="Microsoft.Android.Runtime.android.21-x64" Version="[$(MicrosoftAndroidVersion)]" />
19+
<PackageDownload Include="Microsoft.iOS.Runtime.ios-arm" Version="[$(MicrosoftiOSVersion)]" />
20+
<PackageDownload Include="Microsoft.iOS.Runtime.ios-arm64" Version="[$(MicrosoftiOSVersion)]" />
21+
<PackageDownload Include="Microsoft.iOS.Runtime.ios-x86" Version="[$(MicrosoftiOSVersion)]" />
22+
<PackageDownload Include="Microsoft.iOS.Runtime.ios-x64" Version="[$(MicrosoftiOSVersion)]" />
23+
<PackageDownload Include="Microsoft.NETCore.App.Runtime.android-arm" Version="[$(DotNetRuntimeVersion)]" />
24+
<PackageDownload Include="Microsoft.NETCore.App.Runtime.android-arm64" Version="[$(DotNetRuntimeVersion)]" />
25+
<PackageDownload Include="Microsoft.NETCore.App.Runtime.android-x86" Version="[$(DotNetRuntimeVersion)]" />
26+
<PackageDownload Include="Microsoft.NETCore.App.Runtime.android-x64" Version="[$(DotNetRuntimeVersion)]" />
27+
<PackageDownload Include="Microsoft.NETCore.App.Runtime.ios-arm" Version="[$(DotNetRuntimeVersion)]" />
28+
<PackageDownload Include="Microsoft.NETCore.App.Runtime.ios-arm64" Version="[$(DotNetRuntimeVersion)]" />
29+
<PackageDownload Include="Microsoft.NETCore.App.Runtime.ios-x86" Version="[$(DotNetRuntimeVersion)]" />
30+
<PackageDownload Include="Microsoft.NETCore.App.Runtime.ios-x64" Version="[$(DotNetRuntimeVersion)]" />
31+
</ItemGroup>
32+
</Project>

src/Maui.Dependencies/Maui.Dependencies.Sdks.csproj

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/Maui.Dependencies/nuget.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<configuration>
33
<packageSources>
44
<clear />
5+
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
56
<add key="xamarin" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
67
</packageSources>
78
</configuration>

0 commit comments

Comments
 (0)