diff options
| author | Kirill Osenkov <KirillOsenkov@users.noreply.github.com> | 2018-09-22 03:54:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-22 03:54:35 +0300 |
| commit | 34e7982fc2b4feb191b81824c54a23f58d86c3d2 (patch) | |
| tree | ab7fcaa2d0d3cf572da91e370a2d787c8cc09c18 | |
| parent | c5dd270acb736932d2d88dab555040b5a95f627f (diff) | |
| parent | ec8cea8b6df64cc4b5ea3641c24bf97be3bad65a (diff) | |
Merge pull request #855 from KirillOsenkov/dev-kirillo-TargetFrameworkd16-0-p1
Set the TargetFrameworkVersion to v4.6.1 when building in MonoDevelop.
| -rw-r--r-- | Directory.Build.props | 8 | ||||
| -rw-r--r-- | TestApps/WpfTest/WpfTest.csproj | 2 | ||||
| -rw-r--r-- | Testing/WpfTestRunner.csproj | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 00000000..6a32fb43 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,8 @@ +<Project> + + <PropertyGroup> + <InMonoDevelopTree Condition="Exists('$(MSBuildThisFileDirectory)..\..\msbuild\MonoDevelop.AfterCommon.props')">true</InMonoDevelopTree> + <TargetFrameworkVersion Condition=" '$(InMonoDevelopTree)' == 'true' ">v4.6.1</TargetFrameworkVersion> + </PropertyGroup> + +</Project> diff --git a/TestApps/WpfTest/WpfTest.csproj b/TestApps/WpfTest/WpfTest.csproj index bf9fbd3b..d4c982c9 100644 --- a/TestApps/WpfTest/WpfTest.csproj +++ b/TestApps/WpfTest/WpfTest.csproj @@ -8,8 +8,8 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>WpfTest</RootNamespace> <AssemblyName>WpfTest</AssemblyName> - <TargetFrameworkProfile>Client</TargetFrameworkProfile> <FileAlignment>512</FileAlignment> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> <DebugSymbols>True</DebugSymbols> diff --git a/Testing/WpfTestRunner.csproj b/Testing/WpfTestRunner.csproj index 83f1b395..2a2e1679 100644 --- a/Testing/WpfTestRunner.csproj +++ b/Testing/WpfTestRunner.csproj @@ -8,9 +8,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>WpfTestRunner</RootNamespace> <AssemblyName>WpfTestRunner</AssemblyName> - <TargetFrameworkProfile>Client</TargetFrameworkProfile> <FileAlignment>512</FileAlignment> <TestRunnerCommand>bin\WpfTestRunner.exe</TestRunnerCommand> + <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PlatformTarget>x86</PlatformTarget> |