mirror of https://github.com/AMT-Cheif/Stylet.git
Explicitly target net5.0-windows
Things worked when referenced from a net5.0-windows project anyway, but might as well keep with the times
This commit is contained in:
Antony Male
parent
60347965b9
commit
26d905c6f0
11
Rakefile
11
Rakefile
|
|
@ -19,20 +19,21 @@ directory COVERAGE_DIR
|
|||
|
||||
desc "Build the project using the current CONFIG (or Debug)"
|
||||
task :build do
|
||||
sh 'dotnet', 'build', '-c', CONFIG, CSPROJ
|
||||
# https://github.com/novotnyllc/MSBuildSdkExtras/pull/249
|
||||
sh 'dotnet', 'build', '-c', CONFIG, CSPROJ, '/nowarn:MSB4011'
|
||||
end
|
||||
|
||||
desc "Run unit tests using the current CONFIG (or Debug)"
|
||||
task :test do
|
||||
sh 'dotnet', 'test', '-c', CONFIG, UNIT_TESTS
|
||||
sh 'dotnet', 'test', '-c', CONFIG, UNIT_TESTS, '/nowarn:MSB4011'
|
||||
end
|
||||
|
||||
desc "Create NuGet package"
|
||||
task :package do
|
||||
# Not sure why these have to be this way around, but they do
|
||||
sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, "-p:NuSpecFile=../#{NUSPEC_START}"
|
||||
sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, '-p:IncludeSymbols=true'
|
||||
sh 'dotnet', 'pack', '-c', CONFIG, TEMPLATES_CSPROJ
|
||||
sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, "-p:NuSpecFile=../#{NUSPEC_START}", '/nowarn:MSB4011'
|
||||
sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, '-p:IncludeSymbols=true', '/nowarn:MSB4011'
|
||||
sh 'dotnet', 'pack', '-c', CONFIG, TEMPLATES_CSPROJ, '/nowarn:MSB4011'
|
||||
end
|
||||
|
||||
desc "Bump version number"
|
||||
|
|
|
|||
|
|
@ -1,14 +1,11 @@
|
|||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Library</OutputType>
|
||||
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
|
||||
<TargetFrameworks>net45;netcoreapp3.0;netcoreapp3.1;net5.0-windows</TargetFrameworks>
|
||||
<CheckEolTargetFramework>false</CheckEolTargetFramework>
|
||||
<UseWPF>true</UseWPF>
|
||||
|
||||
<RootNamespace>Stylet</RootNamespace>
|
||||
<AssemblyName>Stylet</AssemblyName>
|
||||
<AssemblyTitle>Stylet</AssemblyTitle>
|
||||
<CodeAnalysisRuleSet />
|
||||
<EnableDefaultItems>false</EnableDefaultItems>
|
||||
<DocumentationFile>bin\Stylet.xml</DocumentationFile>
|
||||
|
||||
|
|
@ -23,7 +20,7 @@
|
|||
<RepositoryUrl>https://github.com/canton7/Stylet</RepositoryUrl>
|
||||
<Authors>Antony Male</Authors>
|
||||
<Description>A very lightweight but powerful ViewModel-First MVVM framework for WPF, inspired by Caliburn.Micro.</Description>
|
||||
|
||||
|
||||
<!-- Just embed all sources in the PDB: snupkg files don't support bare .cs files, and SourceLink is annoying -->
|
||||
<!-- We set IncludeSymbols in the Rakefile, because we don't want it to apply to Stylet.Start -->
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
|
|
@ -36,7 +33,7 @@
|
|||
<DebugType>full</DebugType>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
||||
<ItemGroup Condition="'$(TargetFramework)' != 'net45'">
|
||||
<PackageReference Include="System.Drawing.Common" Version="4.6.0" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
using System.Reflection;
|
||||
using System.Resources;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Windows;
|
||||
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("StyletIntegrationTests")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("Antony Male")]
|
||||
[assembly: AssemblyProduct("StyletIntegrationTests")]
|
||||
[assembly: AssemblyCopyright("Copyright © Antony Male 2014")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
||||
// to COM components. If you need to access a type in this assembly from
|
||||
// COM, set the ComVisible attribute to true on that type.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
//In order to begin building localizable applications, set
|
||||
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
|
||||
//inside a <PropertyGroup>. For example, if you are using US english
|
||||
//in your source files, set the <UICulture> to en-US. Then uncomment
|
||||
//the NeutralResourceLanguage attribute below. Update the "en-US" in
|
||||
//the line below to match the UICulture setting in the project file.
|
||||
|
||||
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
|
||||
|
||||
|
||||
[assembly: ThemeInfo(
|
||||
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
|
||||
//(used if a resource is not found in the page,
|
||||
// or application resource dictionaries)
|
||||
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
|
||||
//(used if a resource is not found in the page,
|
||||
// app, or any theme specific resource dictionaries)
|
||||
)]
|
||||
|
||||
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
|
|
@ -2,14 +2,12 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
|
||||
<TargetFrameworks>net45;netcoreapp3.1;net5.0-windows</TargetFrameworks>
|
||||
<UseWPF>true</UseWPF>
|
||||
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
<RootNamespace>StyletIntegrationTests</RootNamespace>
|
||||
<AssemblyName>StyletIntegrationTests</AssemblyName>
|
||||
<CodeAnalysisRuleSet />
|
||||
<EnableDefaultItems>false</EnableDefaultItems>
|
||||
|
||||
<Copyright>Copyright © 2014 Antony Male</Copyright>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<RootNamespace>Company.StyletApplication1</RootNamespace>
|
||||
<UseWPF>true</UseWPF>
|
||||
</PropertyGroup>
|
||||
|
||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<RootNamespace>Company.StyletApplication1</RootNamespace>
|
||||
<UseWPF>true</UseWPF>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Stylet" Version="0.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<PackageReference Include="Stylet" Version="1.*" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("StyletUnitTests")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("Antony Male")]
|
||||
[assembly: AssemblyProduct("StyletUnitTests")]
|
||||
[assembly: AssemblyCopyright("Copyright © Antony Male 2014")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
||||
// to COM components. If you need to access a type in this assembly from
|
||||
// COM, set the ComVisible attribute to true on that type.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||
[assembly: Guid("ffe39040-7d51-464f-9f06-9df7f0284536")]
|
||||
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
|
|
@ -1,14 +1,16 @@
|
|||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>netcoreapp3.0;net45</TargetFrameworks>
|
||||
<TargetFrameworks>net5.0-windows</TargetFrameworks>
|
||||
|
||||
<UseWpf>true</UseWpf>
|
||||
<IsPackable>false</IsPackable>
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
|
||||
<Copyright>Copyright © 2014 Antony Male</Copyright>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<SupportedPlatform Include="Windows10.0" />
|
||||
<PackageReference Include="Moq" Version="4.12.0" />
|
||||
<PackageReference Include="nunit" Version="3.11.0" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "3.1.100",
|
||||
"rollForward": "latestFeature"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"MSBuild.Sdk.Extras": "2.0.24"
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue