Skip to content

Commit 27e523f

Browse files
chaosnhatredchaosnhatred
committed
added initial net6.0 support
1 parent 68763ad commit 27e523f

36 files changed

Lines changed: 5574 additions & 43 deletions

‎Prometheus.MSBuild.sln‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30717.126
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31815.197
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{1728676C-93E2-4709-9457-F6C7F598CF4C}"
77
ProjectSection(SolutionItems) = preProject
@@ -48,7 +48,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packages", "Packages", "{A0
4848
EndProject
4949
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net5.Android.Tests", "tests\Net5.Android.Tests\Net5.Android.Tests.csproj", "{94D18088-490B-41E6-A40A-FE1217D8C5A2}"
5050
EndProject
51-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetCore.Windows.Tests", "tests\NetCore.Windows.Tests\NetCore.Windows.Tests.csproj", "{42CB1054-35A6-46E2-8A78-6590FEBBFEA5}"
51+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore.Windows.Tests", "tests\NetCore.Windows.Tests\NetCore.Windows.Tests.csproj", "{42CB1054-35A6-46E2-8A78-6590FEBBFEA5}"
52+
EndProject
53+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net6.Android.Tests", "tests\Net6.Android.Tests\Net6.Android.Tests.csproj", "{6CFBC760-02CB-46C3-901B-1BB4626E49B2}"
5254
EndProject
5355
Global
5456
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -202,6 +204,26 @@ Global
202204
{42CB1054-35A6-46E2-8A78-6590FEBBFEA5}.Release-MONO|Any CPU.Build.0 = Release|Any CPU
203205
{42CB1054-35A6-46E2-8A78-6590FEBBFEA5}.Release-MONO|x64.ActiveCfg = Release|Any CPU
204206
{42CB1054-35A6-46E2-8A78-6590FEBBFEA5}.Release-MONO|x64.Build.0 = Release|Any CPU
207+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
208+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
209+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Debug|x64.ActiveCfg = Debug|Any CPU
210+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Debug|x64.Build.0 = Debug|Any CPU
211+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Debug-MONO|Any CPU.ActiveCfg = Debug|Any CPU
212+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Debug-MONO|Any CPU.Build.0 = Debug|Any CPU
213+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Debug-MONO|x64.ActiveCfg = Debug|Any CPU
214+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Debug-MONO|x64.Build.0 = Debug|Any CPU
215+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.MachineIndependent|Any CPU.ActiveCfg = Debug|Any CPU
216+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.MachineIndependent|Any CPU.Build.0 = Debug|Any CPU
217+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.MachineIndependent|x64.ActiveCfg = Debug|Any CPU
218+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.MachineIndependent|x64.Build.0 = Debug|Any CPU
219+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
220+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Release|Any CPU.Build.0 = Release|Any CPU
221+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Release|x64.ActiveCfg = Release|Any CPU
222+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Release|x64.Build.0 = Release|Any CPU
223+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Release-MONO|Any CPU.ActiveCfg = Release|Any CPU
224+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Release-MONO|Any CPU.Build.0 = Release|Any CPU
225+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Release-MONO|x64.ActiveCfg = Release|Any CPU
226+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2}.Release-MONO|x64.Build.0 = Release|Any CPU
205227
EndGlobalSection
206228
GlobalSection(SolutionProperties) = preSolution
207229
HideSolutionNode = FALSE
@@ -214,6 +236,7 @@ Global
214236
{0237A653-1DF4-40B6-B407-972C01D79127} = {201ABF3E-4DEE-430F-A115-B6FF5ACA85AC}
215237
{94D18088-490B-41E6-A40A-FE1217D8C5A2} = {201ABF3E-4DEE-430F-A115-B6FF5ACA85AC}
216238
{42CB1054-35A6-46E2-8A78-6590FEBBFEA5} = {201ABF3E-4DEE-430F-A115-B6FF5ACA85AC}
239+
{6CFBC760-02CB-46C3-901B-1BB4626E49B2} = {201ABF3E-4DEE-430F-A115-B6FF5ACA85AC}
217240
EndGlobalSection
218241
GlobalSection(ExtensibilityGlobals) = postSolution
219242
SolutionGuid = {1C3B7AFA-2A1C-4272-B7BE-E97A117839FE}

‎Prometheus.MSBuild.sln.DotSettings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,7 @@
449449
<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=XAML_0020Designer/@EntryIndexedValue">LIVE_MONITOR</s:String>
450450
<s:Int64 x:Key="/Default/Environment/SearchAndNavigation/DefaultOccurrencesGroupingIndices/=JetBrains_002EPsiFeatures_002EVisualStudio_002EDebugger_002EBreakpoints_002EBreakpointsBrowserDescriptor/@EntryIndexedValue">3</s:Int64>
451451
<s:Int64 x:Key="/Default/Environment/SearchAndNavigation/DefaultOccurrencesGroupingIndices/=JetBrains_002EReSharper_002EFeature_002EServices_002ENavigation_002EDescriptors_002ESearchUsagesDescriptor/@EntryIndexedValue">12</s:Int64>
452+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EdotCover_002EInteractive_002ECore_002EFilterManagement_002EMigration_002EGlobalFilterSettingsManagerMigrateSettings/@EntryIndexedValue">True</s:Boolean>
452453
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
453454
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
454455
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>

‎README.md‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
<p align="center">
3-
<img src="https://placeholder.pics/svg/500x200/DEDEDE/555555/Project%20Name"
3+
<img src="https://placeholder.pics/svg/500x200/DEDEDE/555555/Prometheus%20Framework"
44
height="130">
55
</p>
66
<p align="center">
@@ -20,6 +20,8 @@
2020
<img src="https://img.shields.io/github/release-date/%USER%/%ProjectName%?label=last release date"></a>
2121
</p>
2222

23+
The Prometheus Framework is a set of msbuild targets and properties that automate the creation of creation of cross-platform or platform specific projects
24+
2325
* [Build Status](#build-status)
2426
* [Supported Platforms](#supported-platforms)
2527
* [Prerequisites](#prerequisites)
@@ -40,44 +42,26 @@
4042

4143
## Build Status
4244

43-
Our [build server](%BUILDSERVER%) builds, tests, and packages the latest MonoGame changes. The table below shows the current build status for the develop branch.
45+
Our [build server](%BUILDSERVER%) builds, tests, and packages the latest Prometheus Framework changes. The table below shows the current build status for the develop branch.
4446

4547
| Name | Status |
4648
|:---|--------|
47-
| Build Windows, Web, and Android | [![Build Status](http://teamcity.monogame.net/app/rest/builds/buildType:MonoGame_DevelopWin/statusIcon)](http://teamcity.monogame.net/viewType.html?buildTypeId=MonoGame_DevelopWin&guest=1) |
48-
| Build Mac, iOS, and Linux | [![Build Status](http://teamcity.monogame.net/app/rest/builds/buildType:MonoGame_DevelopMac/statusIcon)](http://teamcity.monogame.net/viewType.html?buildTypeId=MonoGame_DevelopMac&guest=1) |
49-
| Generate Documentation | [![Build Status](http://teamcity.monogame.net/app/rest/builds/buildType:MonoGame_GenerateDocumentation/statusIcon)](http://teamcity.monogame.net/viewType.html?buildTypeId=MonoGame_GenerateDocumentation&guest=1) |
50-
| Windows Tests | [![Build Status](http://teamcity.monogame.net/app/rest/builds/buildType:MonoGame_TestWindows/statusIcon)](http://teamcity.monogame.net/viewType.html?buildTypeId=MonoGame_TestWindows&guest=1) |
51-
| Package NuGet | [![Build Status](http://teamcity.monogame.net/app/rest/builds/buildType:MonoGame_PackageNuGet/statusIcon)](http://teamcity.monogame.net/viewType.html?buildTypeId=MonoGame_PackageNuGet&guest=1) |
52-
| Package Mac and Linux | [![Build Status](http://teamcity.monogame.net/app/rest/builds/buildType:MonoGame_PackageMacAndLinux/statusIcon)](http://teamcity.monogame.net/viewType.html?buildTypeId=MonoGame_PackageMacAndLinux&guest=1) |
53-
| Package Windows | [![Build Status](http://teamcity.monogame.net/app/rest/builds/buildType:MonoGame_PackagingWindows/statusIcon)](http://teamcity.monogame.net/viewType.html?buildTypeId=MonoGame_PackagingWindows&guest=1) |
54-
5549

5650
## Supported Platforms
5751

5852
We support a growing list of platforms across the desktop, mobile, and console space. If there is a platform we don't support, please [make a request](https://github.com/MonoGame/MonoGame/issues) or [come help us](CONTRIBUTING.md) add it.
5953

6054
* Desktop PCs
61-
* Windows 10 Store Apps (UWP)
62-
* Windows Win32 (OpenGL & DirectX)
63-
* Linux (OpenGL)
64-
* Mac OS X (OpenGL)
55+
* Windows Win32 (.Net4.8, .Netstandard2.1, .Netcore3.1, .Net5.0)
56+
* Linux (.Netstandard2.1, .Netcore3.1, .Net5.0)
6557
* Mobile/Tablet Devices
66-
* Android (OpenGL)
67-
* iPhone/iPad (OpenGL)
68-
* Windows Phone 10 (UWP)
69-
* Consoles (for registered developers)
70-
* PlayStation 4
71-
* PlayStation Vita
72-
* Xbox One (both UWP and XDK)
73-
* Nintendo Switch
74-
* Other
75-
* tvOS (OpenGL)
58+
* Android (Xamarin, .Net5.0)
7659

7760
The included sandboxes show a default/empty application for each platform
7861

7962
### Prerequisites
80-
* To-do
63+
* MSBuild >= 16.0
64+
* .Net == 4.8
8165

8266
## Installation
8367

‎src/Prometheus.MSBuild/Directory.Build.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project InitialTargets="CopyTasksToLib">
22
<PropertyGroup>
33
<SectionSymbol>@</SectionSymbol>
4-
<TargetFrameworks>net40;net5.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
5-
<!--<TargetFramework>net5.0;monoandroid90</TargetFramework>-->
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.1;net40;</TargetFrameworks>
5+
<!--<TargetFramework>net5.0;monoandroid90;net40;net5.0;netcoreapp3.1;netstandard2.1;</TargetFramework>-->
66
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
77
<LocalNugetRepo>D:\Users\Bryan\Documents\Projects\HelixTechGroup\local-nuget</LocalNugetRepo>
88
<PackageOnlyBuild>true</PackageOnlyBuild>
99
<IsLibraryProject>true</IsLibraryProject>
1010
<IsPackageOnlyProject>true</IsPackageOnlyProject>
1111
<DevelopmentDependency>true</DevelopmentDependency>
12-
<Description>Provides the ability to centrally manage your NuGet package versions when using PackageReference.</Description>
13-
<PackageTags>MSBuild MSBuildSdk</PackageTags>
12+
<Description>The Prometheus Framework is a set of msbuild targets and properties that automate the creation of creation of cross-platform or platform specific projects</Description>
13+
<PackageTags>MSBuild MSBuildSdk android windows linux cross-platform dotnet build-tool build-tools crossplatform msbuild-sdk msbuild-tasks</PackageTags>
1414
<ArtifactsPath>$(BaseArtifactsPath)\$(MSBuildProjectName)\</ArtifactsPath>
1515
<IncludeBuildOutput>false</IncludeBuildOutput>
1616
<BuildPackage>true</BuildPackage>
@@ -24,7 +24,7 @@
2424
<PropertyGroup>
2525
<CompanyName>HelixTechGroup,llc</CompanyName>
2626
<AuthorName>Bryan M. Longacre</AuthorName>
27-
<ProductVersion>0.0.1</ProductVersion>
27+
<ProductVersion>0.1.0</ProductVersion>
2828
</PropertyGroup>
2929

3030
<ItemGroup>

‎src/Prometheus.MSBuild/Globals/Globals.Build.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<IncludeBuildOutput>False</IncludeBuildOutput>
3434
<IncludeSymbols>false</IncludeSymbols>
3535
<NoWarn>$(NoWarn);2008;8021</NoWarn>
36-
<PackageTags>aspnet;templates</PackageTags>
3736
<!--<NuspecFile>$(MSBuildThisFileDirectory)templates.nuspec</NuspecFile>-->
3837
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
3938
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>

‎src/Prometheus.MSBuild/Globals/NuGet.Build.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<SymbolPackageFormat Condition="'$(SymbolPackageFormat)' == ''">snupkg</SymbolPackageFormat>
99
<Deterministic Condition="'$(Deterministic)' == ''">true</Deterministic>
1010
<NuspecDirectory Condition=" '$(NuspecDirectory)' == '' ">$(SolutionDir)nuspecs</NuspecDirectory>
11+
<!--<PackageTags></PackageTags>-->
1112
</PropertyGroup>
1213

1314
<Import Project="$(PrometheusGlobalDirectory)\GitHub.Build.props" Condition="'$(UseGitHub)' == 'true'" />
@@ -27,6 +28,7 @@
2728
<Message Text="| $(SectionSymbol) PublishRepositoryUrl: $(PublishRepositoryUrl)" Importance="high" />
2829
<Message Text="| $(SectionSymbol) EmbedUntrackedSources: $(EmbedUntrackedSources)" Importance="high" />
2930
<Message Text="| $(SectionSymbol) UseGitHub: $(UseGitHub)" Importance="high" />
31+
<Message Text="| $(SectionSymbol) PackageTags: $(PackageTags)" Importance="high" />
3032
<Message Text="| $(SectionSymbol) ---------------------------------------" Importance="high" />
3133
</Target>
3234
</Project>

‎src/Prometheus.MSBuild/Globals/NuGet.Build.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<Message Text="| $(SectionSymbol) PublishRepositoryUrl: $(PublishRepositoryUrl)" Importance="high" />
2929
<Message Text="| $(SectionSymbol) EmbedUntrackedSources: $(EmbedUntrackedSources)" Importance="high" />
3030
<Message Text="| $(SectionSymbol) UseGitHub: $(UseGitHub)" Importance="high" />
31+
<Message Text="| $(SectionSymbol) PackageTags: $(PackageTags)" Importance="high" />
3132
<Message Text="| $(SectionSymbol) ---------------------------------------" Importance="high" />
3233
</Target>
3334
</Project>

‎src/Prometheus.MSBuild/Platform/Android/Platform.Build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<TargetFramework></TargetFramework>
77
</PropertyGroup>
88
<PropertyGroup Condition="'$(HasXamarin)' != 'true'">
9-
<TargetFramework>net5.0-android</TargetFramework>
9+
<TargetFramework>$(RuntimeId)-android</TargetFramework>
1010
</PropertyGroup>
1111
<PropertyGroup>
1212
<PlatformId>Android</PlatformId>
@@ -39,13 +39,13 @@
3939
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.8" Condition="'$(UseAndroidX)' == 'true'"/>
4040
</ItemGroup>
4141
<!--<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />-->
42-
<ItemGroup>
42+
<ItemGroup Condition="'$(RuntimeId)' == 'net5.0'">
4343
<None Include="packages.config" />
4444
<None Include="Resources\AboutResources.txt" />
4545
<None Include="Properties\AndroidManifest.xml" />
4646
<None Include="Assets\AboutAssets.txt" />
4747
</ItemGroup>
48-
<ItemGroup>
48+
<ItemGroup Condition="'$(RuntimeId)' == 'net5.0'">
4949
<AndroidResource Include="Resources\values\strings.xml" />
5050
<Folder Include="Resources\drawable\" />
5151
</ItemGroup>

‎src/Prometheus.MSBuild/Platform/Android/Platform.Build.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<TargetFramework></TargetFramework>
6868
</PropertyGroup>
6969
<PropertyGroup Condition="'$(HasXamarin)' != 'true'">
70-
<TargetFramework>net5.0-android</TargetFramework>
70+
<TargetFramework>$(RuntimeId)-android</TargetFramework>
7171
</PropertyGroup>
7272
<PropertyGroup>
7373
<PlatformId>Android</PlatformId>
@@ -100,13 +100,13 @@
100100
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.8" Condition="'$(UseAndroidX)' == 'true'"/>
101101
</ItemGroup>
102102
<!--<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />-->
103-
<ItemGroup>
103+
<ItemGroup Condition="'$(RuntimeId)' == 'net5.0'">
104104
<None Include="packages.config" />
105105
<None Include="Resources\AboutResources.txt" />
106106
<None Include="Properties\AndroidManifest.xml" />
107107
<None Include="Assets\AboutAssets.txt" />
108108
</ItemGroup>
109-
<ItemGroup>
109+
<ItemGroup Condition="'$(RuntimeId)' == 'net5.0'">
110110
<AndroidResource Include="Resources\values\strings.xml" />
111111
<Folder Include="Resources\drawable\" />
112112
</ItemGroup>

‎tests/Net5.Android.Tests/Resources/Resource.designer.cs‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)