This commit is contained in:
James Clancey 2022-05-11 12:05:38 -08:00
Родитель 4b34300a89
Коммит a96dd641a1
7 изменённых файлов: 9 добавлений и 21 удалений

7
.github/workflows/dev.yml поставляемый
Просмотреть файл

@ -50,11 +50,8 @@ jobs:
run: |
& dotnet workload install maui `
--skip-sign-check `
--from-rollback-file https://aka.ms/dotnet/maui/6.0.300/rc.2.json `
--source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-323bf2dd/nuget/v3/index.json `
--source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-572aeedc/nuget/v3/index.json `
--source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json `
--source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-a21b9a2d/nuget/v3/index.json `
--from-rollback-file https://aka.ms/dotnet/maui/6.0.300/rc.3.json `
--source https://aka.ms/dotnet6/nuget/index.json `
--source https://api.nuget.org/v3/index.json

10
.github/workflows/main.yml поставляемый
Просмотреть файл

@ -45,18 +45,16 @@ jobs:
with:
vs-prerelease: true
- name: Install Maui Workload
- name: Install Maui Workload
shell: pwsh
run: |
& dotnet workload install maui `
--skip-sign-check `
--from-rollback-file https://aka.ms/dotnet/maui/6.0.300/rc.2.json `
--source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-323bf2dd/nuget/v3/index.json `
--source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-572aeedc/nuget/v3/index.json `
--source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json `
--source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-a21b9a2d/nuget/v3/index.json `
--from-rollback-file https://aka.ms/dotnet/maui/6.0.300/rc.3.json `
--source https://aka.ms/dotnet6/nuget/index.json `
--source https://api.nuget.org/v3/index.json
- name: Set Maui Version
run: dotnet run --project build/MauiVersionUpdater/MauiVersionUpdater.csproj -- https://aka.ms/dotnet/maui/6.0.300/rc.2.json

2
External/Maui поставляемый

@ -1 +1 @@
Subproject commit acf9a61ae05fa0ca0d1f6554507e5957006a1af2
Subproject commit bb116a4a908174c33a1d62de3dee833c8a125372

Просмотреть файл

@ -38,10 +38,5 @@
<ProjectReference Include="..\..\external\Maui\src\Core\src\Core.csproj" />
<ProjectReference Include="..\..\external\Maui\src\Essentials\src\Essentials.csproj" />
</ItemGroup>
<PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
<OutputType>WinExe</OutputType>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<WindowsPackageType>MSIX</WindowsPackageType>
</PropertyGroup>
<ProjectExtensions><VisualStudio><UserProperties XamarinHotReloadDebuggerTimeoutExceptionCometSingleProjectSampleHideInfoBar="True" /></VisualStudio></ProjectExtensions>
</Project>

Просмотреть файл

@ -4,7 +4,5 @@
<UseMaui Condition=" '$(UseWorkload)' == 'true' ">true</UseMaui>
</PropertyGroup>
<Import Project="../../External/Maui/Directory.Build.props" />
<Import Project="../../External/Maui/src/Maui.InTree.props"/>
</Project>

Просмотреть файл

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Project>
<Import Project="../../External/Maui/src/Maui.InTree.targets"/>
<Import Project="../../External/Maui/src/Maui.InTree.targets"/>
<Import Project="../../External/Maui/Directory.Build.targets" />
</Project>

Просмотреть файл

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Project>
<Import Project="..\External\Maui\eng\AndroidX.targets" />
<Import Project="..\External\Maui\eng\Versions.props" />
<Import Project="..\External\Maui\eng\Microsoft.Extensions.targets" />
<Import Project="..\Directory.Build.targets" />
</Project>