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

Merge all the .NET 6 projects/solutions #2505

Merged
merged 34 commits into from
Sep 17, 2021
Merged

Merge all the .NET 6 projects/solutions #2505

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ed46eca
Move Blazor into a separate folder
mattleibow Aug 26, 2021
a154fab
Merge all the .NET 6 projects/solutions
mattleibow Sep 15, 2021
8806ef7
Windows projects
mattleibow Sep 15, 2021
eae9b84
that
mattleibow Sep 15, 2021
7cf6612
Make things better
mattleibow Sep 15, 2021
4b81722
clean up
mattleibow Sep 16, 2021
7778e30
fix that
mattleibow Sep 16, 2021
e03cdc1
fast deploy debug
mattleibow Sep 16, 2021
c9da63c
remove that
mattleibow Sep 16, 2021
9c5eab7
Fix paths
mattleibow Sep 16, 2021
49015ec
fixing things
mattleibow Sep 16, 2021
7460d3b
fix that
mattleibow Sep 16, 2021
72df2b4
solutions
mattleibow Sep 16, 2021
516c9ee
Merge remote-tracking branch 'origin/main' into dev/unify
mattleibow Sep 16, 2021
ec2794d
fix builds for macos
mattleibow Sep 16, 2021
045c275
lols to me
mattleibow Sep 16, 2021
27806bb
Merge remote-tracking branch 'origin/main' into dev/unify
mattleibow Sep 16, 2021
2186921
not a razor app
mattleibow Sep 16, 2021
24525f7
Merge remote-tracking branch 'origin/main' into dev/unify
mattleibow Sep 16, 2021
2a2b2b6
Merge remote-tracking branch 'origin/main' into dev/unify
mattleibow Sep 16, 2021
2075d2c
Use LogicalName
mattleibow Sep 17, 2021
33a6a58
Merge branch 'de/sample' into dev/unify
mattleibow Sep 17, 2021
6ae70d9
renamed
mattleibow Sep 17, 2021
e82e6f4
No more Controls.SourceGen-net6
mattleibow Sep 17, 2021
dc9ec53
Add Controls DeviceTests
mattleibow Sep 17, 2021
b5b231a
win
mattleibow Sep 17, 2021
9d71722
update
mattleibow Sep 17, 2021
576cd64
visibility
mattleibow Sep 17, 2021
8f60d59
Fix bug! Wee!
mattleibow Sep 17, 2021
13f0a38
- fix cake script to use correct sln for mac
PureWeen Sep 17, 2021
5235c42
- change winui to just use vs-net6 target but default to global
PureWeen Sep 17, 2021
f11e55a
- fix VS-STable cake
PureWeen Sep 17, 2021
c9fe083
oops
mattleibow Sep 17, 2021
5857b36
- copy info.plist local
PureWeen Sep 17, 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
0 Compatibility.ControlGallery.sln → ._Compatibility.ControlGallery.sln
View file
Open in desktop
File renamed without changes.
0 Microsoft.Maui.BuildTasks.sln → ._Microsoft.Maui.BuildTasks.sln
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Microsoft.Maui.Droid.sln → ._Microsoft.Maui.Droid-net6.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Compon
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiRazorClassLibrarySample", "src\BlazorWebView\samples\MauiRazorClassLibrarySample\MauiRazorClassLibrarySample.csproj", "{A33803A8-D398-49F3-B5E8-8C812237829A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.SourceGen-net6", "src\Controls\src\SourceGen\Controls.SourceGen-net6.csproj", "{FE48D482-1E5A-4CD6-A3D8-C3FBC0AE1DA1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.SourceGen", "src\Controls\src\SourceGen\Controls.SourceGen.csproj", "{FE48D482-1E5A-4CD6-A3D8-C3FBC0AE1DA1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
0 Microsoft.Maui.iOS.sln → ._Microsoft.Maui.iOS.sln
View file
Open in desktop
File renamed without changes.
0 Microsoft.Maui.sln → ._Microsoft.Maui.sln
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-format-daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
action: "fix"
#only-changed-files: true # only works for PRs
workspace: "Microsoft.Maui.sln"
workspace: "Microsoft.Maui-net6.sln"

- name: Commit files
if: steps.format.outputs.has-changes == 'true'
Expand Down
381 changes: 0 additions & 381 deletions BlazorNonWindows-net6.sln
View file
Open in desktop

This file was deleted.

427 changes: 0 additions & 427 deletions BlazorWindows-net6.sln
View file
Open in desktop

This file was deleted.

119 changes: 0 additions & 119 deletions BlazorWindowsDesktop-net6.sln
View file
Open in desktop

This file was deleted.

64 changes: 33 additions & 31 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,49 @@
<Import Project="eng\Versions.props" />

<PropertyGroup>
<BuildForWinUI Condition=" ($(SolutionFileName.Contains('winui')) OR '$(SolutionFileName)' == 'BlazorWindows-net6.sln') AND '$(Packing)' == ''">true</BuildForWinUI>
<BuildForAndroid Condition="'$(SolutionFileName)' == 'Microsoft.Maui.Droid.sln' AND '$(Packing)' == ''">true</BuildForAndroid>
<BuildForNet6 Condition="'$(Packing)' == 'true' OR $(MSBuildProjectFile.Contains('SingleProject')) OR $(MSBuildProjectFile.Contains('Profiling')) OR $(MSBuildProjectFile.Contains('net6')) OR $(SolutionFileName.Contains('net6')) OR '$(BuildForWinUI)' == 'true' OR '$(BuildForAndroid)' == 'true'">true</BuildForNet6>
<MauiPlatforms>net6.0-ios;net6.0-maccatalyst;net6.0-android</MauiPlatforms>
<WindowsMauiPlatforms Condition="'$(WindowsMauiPlatforms)' == ''">net6.0-windows10.0.19041;net6.0-windows10.0.18362</WindowsMauiPlatforms>
<MauiPlatforms Condition="'$(Packing)' == 'true'">$(MauiPlatforms);$(WindowsMauiPlatforms)</MauiPlatforms>
<MauiPlatforms Condition="'$(BuildForWinUI)' == 'true'">$(WindowsMauiPlatforms)</MauiPlatforms>
<MauiPlatforms Condition="'$(BuildForAndroid)' == 'true'">net6.0-android</MauiPlatforms>

<!-- Work around the IDE not properly handling the NU1703 warning -->
<MauiPlatformsNoMacCat>net6.0-ios;net6.0-android</MauiPlatformsNoMacCat>
<MauiPlatformsNoMacCat Condition="'$(BuildForWinUI)' == 'true'">$(MauiPlatforms)</MauiPlatformsNoMacCat>
<MauiPlatformsNoMacCat Condition="'$(BuildForAndroid)' == 'true'">$(MauiPlatforms)</MauiPlatformsNoMacCat>

<!-- This is used to easily build for a specific target to make the IDE work a bit better -->
<NonNet6Platforms>Xamarin.iOS10;MonoAndroid10.0</NonNet6Platforms>
<NonNet6EssentialsPlatforms>netstandard2.0;netstandard2.1;Xamarin.iOS10;MonoAndroid90;MonoAndroid10.0;tizen40;Xamarin.Mac20;</NonNet6EssentialsPlatforms>
<NonNet6EssentialsPlatforms Condition=" '$(OS)' == 'Windows_NT'">$(NonNet6EssentialsPlatforms);uap10.0.16299;</NonNet6EssentialsPlatforms>

<BuildNonNet6ForiOS>false</BuildNonNet6ForiOS>
<BuildNonNet6ForiOS Condition="'$(SolutionFileName)' == 'Microsoft.Maui.iOS.sln'">true</BuildNonNet6ForiOS>
<NonNet6Platforms Condition="'$(BuildNonNet6ForiOS)' == 'true'">Xamarin.iOS10</NonNet6Platforms>
<NonNet6EssentialsPlatforms Condition="'$(BuildNonNet6ForiOS)' == 'true'">netstandard2.0;netstandard2.1;Xamarin.iOS10</NonNet6EssentialsPlatforms>
<IncludeWindowsTargetFrameworks Condition="($([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full') or ('$(Packing)' == 'true')">true</IncludeWindowsTargetFrameworks>
<BuildForAndroidOnly Condition="$(SolutionFileName.StartsWith('._Microsoft.Maui.Droid')) and '$(Packing)' == ''">true</BuildForAndroidOnly>
<BuildForiOSOnly Condition="$(SolutionFileName.StartsWith('._Microsoft.Maui.iOS')) and '$(Packing)' == ''">true</BuildForiOSOnly>
<BuildForLegacy Condition="$(SolutionFileName.StartsWith('._')) and !$(SolutionFileName.Contains('-net6')) and '$(Packing)' == ''">true</BuildForLegacy>
</PropertyGroup>

<BuildNonNet6ForAndroid>false</BuildNonNet6ForAndroid>
<NonNet6Platforms Condition="'$(BuildNonNet6ForAndroid)' == 'true'">MonoAndroid10.0</NonNet6Platforms>
<NonNet6EssentialsPlatforms Condition="'$(BuildNonNet6ForAndroid)' == 'true'">netstandard2.0;netstandard2.1;MonoAndroid10.0</NonNet6EssentialsPlatforms>
<PropertyGroup>
<DefineConstants Condition="$(TargetFramework.Contains('-windows'))">$(DefineConstants);WINDOWS</DefineConstants>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>

<!-- <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles> -->

<!-- HACK: WinUI seems to have issues without this -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
<DisableEmbeddedXbf>false</DisableEmbeddedXbf>

<DefineConstants Condition="$(TargetFramework.Contains('-windows'))">$(DefineConstants);WINDOWS</DefineConstants>

<!-- Workaround: https://github.com/dotnet/sdk/issues/19050 -->
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup>

<PropertyGroup Condition="'$(BuildForLegacy)' != 'True'">
<!-- the real TFMs -->
<MauiPlatforms>net6.0-ios;net6.0-maccatalyst;net6.0-android</MauiPlatforms>
<WindowsMauiPlatforms Condition="'$(WindowsMauiPlatforms)' == ''">net6.0-windows10.0.19041;net6.0-windows10.0.18362</WindowsMauiPlatforms>
<MauiPlatforms Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(MauiPlatforms);$(WindowsMauiPlatforms)</MauiPlatforms>

<!-- Work around the IDE not properly handling the NU1703 warning -->
<MauiPlatformsNoMacCat>net6.0-ios;net6.0-android</MauiPlatformsNoMacCat>
<MauiPlatformsNoMacCat Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(MauiPlatformsNoMacCat);$(WindowsMauiPlatforms)</MauiPlatformsNoMacCat>
</PropertyGroup>

<PropertyGroup Condition="'$(BuildForLegacy)' == 'true'">
<!-- the legacy TFMs -->
<MauiPlatforms>Xamarin.iOS10;MonoAndroid10.0</MauiPlatforms>
<!-- UWP is no longer supported -->
<WindowsMauiPlatforms></WindowsMauiPlatforms>
<MauiPlatforms Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(MauiPlatforms);$(WindowsMauiPlatforms)</MauiPlatforms>
<MauiAdditionalPlatforms>MonoAndroid90;tizen40;Xamarin.Mac20</MauiAdditionalPlatforms>

<!-- This is used to easily build for a specific target to make the IDE work a bit better -->
<MauiPlatforms Condition="'$(BuildForiOSOnly)' == 'true'">Xamarin.iOS10</MauiPlatforms>
<MauiAdditionalPlatforms Condition="'$(BuildForiOSOnly)' == 'true'"></MauiAdditionalPlatforms>
<MauiPlatforms Condition="'$(BuildForAndroidOnly)' == 'true'">MonoAndroid10.0</MauiPlatforms>
<MauiAdditionalPlatforms Condition="'$(BuildForAndroidOnly)' == 'true'"></MauiAdditionalPlatforms>
</PropertyGroup>

<PropertyGroup>
<MauiRootDirectory>$(MSBuildThisFileDirectory)</MauiRootDirectory>
<MauiNuSpecDirectory>$(MSBuildThisFileDirectory).nuspec/</MauiNuSpecDirectory>
Expand Down
Loading