这是indexloc提供的服务，不要输入任何密码
Skip to content

Multitargeting NetCore 3/Net4.5.2 #2

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

Merged
merged 1 commit into from
Sep 7, 2019
Merged

Multitargeting NetCore 3/Net4.5.2 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
[![Release](https://img.shields.io/github/release/Dirkster99/WSF.svg)](https://github.com/Dirkster99/WSF/releases/latest)
[![NuGet](https://img.shields.io/nuget/dt/Dirkster.WSF.svg)](http://nuget.org/packages/Dirkster.WSF)

![Net4](https://badgen.net/badge/Framework/.Net 4/blue) ![NetCore3](https://badgen.net/badge/Framework/NetCore 3/blue)

# Windows Shell Foundation (WSF)

<h2><img src="https://github.com/Dirkster99/WSF/blob/master/ProjectIcon.png?raw=true" height="64"/>&nbsp;Overview</h2>
Expand Down
33 changes: 33 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
version: 1.2.{build}

branches:
only:
- master

before_build:
- cmd: nuget restore source/WSF.sln

build:
verbosity: minimal

configuration: Release

platform: Any CPU

image: Visual Studio 2019 Preview

install:
- cmd: choco install dotnetcore-sdk --pre

artifacts:
- path: source\WSF\bin\Release
name: WSF

- path: source\Demos\Client\bin\Release
name: Client

- path: source\Demos\PerformanceTestClient\bin\Release
name: PerformanceTestClient

- path: source\Demos\WpfPerformance\bin\Release
name: WpfPerformance
6 changes: 0 additions & 6 deletions source/Demos/Client/App.config
View file
Open in desktop

This file was deleted.

60 changes: 7 additions & 53 deletions source/Demos/Client/Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{8BB7BFC8-1A2E-401B-8F90-1A5C45C91F76}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>Client</RootNamespace>
<AssemblyName>Client</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworks>net452;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\WSF\WSF.csproj">
<Project>{2fb5c730-5836-4ed7-abca-2b9669e8c0a6}</Project>
<Name>WSF</Name>
</ProjectReference>
<ProjectReference Include="..\..\WSF\WSF.csproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

</Project>
1 change: 0 additions & 1 deletion source/Demos/Client/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
{
using WSF;
using WSF.IDs;
using WSF.Shell.Interop.Interfaces.Knownfolders;
using WSF.Shell.Interop.Knownfolders;
using System;
using System.Collections.Generic;
Expand Down
36 changes: 0 additions & 36 deletions source/Demos/Client/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions source/Demos/PerformanceTestClient/App.config
View file
Open in desktop

This file was deleted.

61 changes: 7 additions & 54 deletions source/Demos/PerformanceTestClient/PerformanceTestClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{FF9EEC41-56B0-4142-B0F0-9612B1EDA355}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>PerformanceTestClient</RootNamespace>
<AssemblyName>PerformanceTestClient</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<TargetFrameworks>net452;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\WSF\WSF.csproj">
<Project>{2FB5C730-5836-4ED7-ABCA-2B9669E8C0A6}</Project>
<Name>WSF</Name>
</ProjectReference>
<ProjectReference Include="..\..\WSF\WSF.csproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

</Project>
36 changes: 0 additions & 36 deletions source/Demos/PerformanceTestClient/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

13 changes: 6 additions & 7 deletions source/Demos/UnitTestWSF/UnitTestWSF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,18 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SubSystem\ShellInteropTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\WSF\WSF.csproj">
<Project>{2fb5c730-5836-4ed7-abca-2b9669e8c0a6}</Project>
<Name>WSF</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Resources\New folder.zip">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<ProjectReference Include="..\..\WSF\WSF.csproj">
<Project>{17a98155-ddae-4b97-a48b-c1e0a077049d}</Project>
<Name>WSF</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down
55 changes: 0 additions & 55 deletions source/Demos/WpfPerformance/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

Loading