daohualiuxiang
/
dotnet-podcasts
mirror of https://github.com/microsoft/dotnet-podcasts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/microsoft/dotnet-podcasts into main

pull/57/head
James Montemagno 2022-03-25 16:13:18 -07:00
parent 5348e3e33b 00be1bb25b
commit 373d813710
6 changed files with 18 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mobile/Microsoft.NetConf2021.Maui.csproj
View File

@ -68,7 +68,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Web\Components\Podcast.Components.Maui.csproj" />
<ProjectReference Include="..\Web\Components\Podcast.Components.csproj" />
</ItemGroup>
<ItemGroup>

12
src/Mobile/Podcasts.DotnetMaui.sln
View File

@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{3C5FB15D-901F-4991-AAFE-4C60F3B328C4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Podcast.Components.Maui", "..\Web\Components\Podcast.Components.Maui.csproj", "{346FBAD6-F121-4FD7-9F2D-6D685397FF3C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Podcast.Components", "..\Web\Components\Podcast.Components.csproj", "{39AD8B68-B8D3-43D4-86D4-3589E4AE81AD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -27,16 +27,16 @@ Global
{40AF2684-0216-4D63-A53E-FE96B524EA10}.Release|Any CPU.ActiveCfg = Release|Any CPU
{40AF2684-0216-4D63-A53E-FE96B524EA10}.Release|Any CPU.Build.0 = Release|Any CPU
{40AF2684-0216-4D63-A53E-FE96B524EA10}.Release|Any CPU.Deploy.0 = Release|Any CPU
{346FBAD6-F121-4FD7-9F2D-6D685397FF3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{346FBAD6-F121-4FD7-9F2D-6D685397FF3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{346FBAD6-F121-4FD7-9F2D-6D685397FF3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{346FBAD6-F121-4FD7-9F2D-6D685397FF3C}.Release|Any CPU.Build.0 = Release|Any CPU
{39AD8B68-B8D3-43D4-86D4-3589E4AE81AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{39AD8B68-B8D3-43D4-86D4-3589E4AE81AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39AD8B68-B8D3-43D4-86D4-3589E4AE81AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39AD8B68-B8D3-43D4-86D4-3589E4AE81AD}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{346FBAD6-F121-4FD7-9F2D-6D685397FF3C} = {3C5FB15D-901F-4991-AAFE-4C60F3B328C4}
{39AD8B68-B8D3-43D4-86D4-3589E4AE81AD} = {3C5FB15D-901F-4991-AAFE-4C60F3B328C4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {61F7FB11-1E47-470C-91E2-47F8143E1572}

20
src/MobileBlazor/Podcast.DotnetMaui.Blazor.sln
View File

@ -11,9 +11,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
..\..\Directory.build.props = ..\..\Directory.build.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Podcast.Pages.Maui", "..\Web\Pages\Podcast.Pages.Maui.csproj", "{397AF9A1-5FBA-44C9-8AE6-D3B6D6B44771}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Podcast.Pages", "..\Web\Pages\Podcast.Pages.csproj", "{73E176E8-652E-4236-A33C-B8841CD6391E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Podcast.Components.Maui", "..\Web\Components\Podcast.Components.Maui.csproj", "{02C5664F-3108-4A44-84E1-79D5397B0848}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Podcast.Components", "..\Web\Components\Podcast.Components.csproj", "{BFA06A28-839A-4324-87EE-2FF6B8D522A2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -30,14 +30,14 @@ Global
{93EBAD76-9884-41EB-806E-56887D7DE3E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{93EBAD76-9884-41EB-806E-56887D7DE3E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{93EBAD76-9884-41EB-806E-56887D7DE3E1}.Release|Any CPU.Build.0 = Release|Any CPU
{397AF9A1-5FBA-44C9-8AE6-D3B6D6B44771}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{397AF9A1-5FBA-44C9-8AE6-D3B6D6B44771}.Debug|Any CPU.Build.0 = Debug|Any CPU
{397AF9A1-5FBA-44C9-8AE6-D3B6D6B44771}.Release|Any CPU.ActiveCfg = Release|Any CPU
{397AF9A1-5FBA-44C9-8AE6-D3B6D6B44771}.Release|Any CPU.Build.0 = Release|Any CPU
{02C5664F-3108-4A44-84E1-79D5397B0848}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{02C5664F-3108-4A44-84E1-79D5397B0848}.Debug|Any CPU.Build.0 = Debug|Any CPU
{02C5664F-3108-4A44-84E1-79D5397B0848}.Release|Any CPU.ActiveCfg = Release|Any CPU
{02C5664F-3108-4A44-84E1-79D5397B0848}.Release|Any CPU.Build.0 = Release|Any CPU
{73E176E8-652E-4236-A33C-B8841CD6391E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{73E176E8-652E-4236-A33C-B8841CD6391E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{73E176E8-652E-4236-A33C-B8841CD6391E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{73E176E8-652E-4236-A33C-B8841CD6391E}.Release|Any CPU.Build.0 = Release|Any CPU
{BFA06A28-839A-4324-87EE-2FF6B8D522A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BFA06A28-839A-4324-87EE-2FF6B8D522A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BFA06A28-839A-4324-87EE-2FF6B8D522A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BFA06A28-839A-4324-87EE-2FF6B8D522A2}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

2
src/MobileBlazor/mauiapp/NetPodsMauiBlazor.csproj
View File

@ -61,6 +61,6 @@
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Web\Pages\Podcast.Pages.Maui.csproj" />
<ProjectReference Include="..\..\Web\Pages\Podcast.Pages.csproj" />
</ItemGroup>
</Project>

27
src/Web/Components/Podcast.Components.Maui.csproj
View File

@ -1,27 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<TargetFrameworks>net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>Podcast.Components</RootNamespace>
<PackageId>Podcast.Components</PackageId>
<OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<SupportedPlatform Include="browser" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.1" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.1" />
</ItemGroup>
</Project>

31
src/Web/Pages/Podcast.Pages.Maui.csproj
View File

@ -1,31 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<TargetFrameworks>net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>Podcast.Pages</RootNamespace>
<PackageId>Podcast.Pages</PackageId>
<OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<SupportedPlatform Include="browser" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Components\Podcast.Components.Maui.csproj" />
<ProjectReference Include="..\Shared\Podcast.Shared.csproj" />
</ItemGroup>
</Project>