OSDN Git Service

UWP版もパッケージリファレンス形式に移行した
authortest <test@yahoo.co.jp>
Wed, 20 Jun 2018 11:56:18 +0000 (20:56 +0900)
committertest <test@yahoo.co.jp>
Wed, 20 Jun 2018 11:56:18 +0000 (20:56 +0900)
UWP/FooEditEngine.UWP.sln
UWP/FooEditEngine.UWP/FooEditEngine.UWP.csproj
UWP/FooEditEngine.UWP/Properties/FooEditEngine.UWP.rd.xml
UWP/FooEditEngine.UWP/project.json [deleted file]
UWP/Test/Test.csproj
UWP/Test/Test_TemporaryKey.pfx
UWP/Test/project.json [deleted file]

index 42fd0eb..f93895c 100644 (file)
@@ -1,18 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2035
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Core", "..\Core\Core.shproj", "{C244F4E5-45D2-4C1F-BD2A-A5CC90D9421B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FooEditEngine.UWP", "FooEditEngine.UWP\FooEditEngine.UWP.csproj", "{CD4DB9CC-9113-482B-8BBE-74E1B4032981}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FooEditEngine.UWP", "FooEditEngine.UWP\FooEditEngine.UWP.csproj", "{02CD8CE7-70E0-48CC-89A9-8863BF006DC7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{43300EA0-22C5-4396-AF6B-E071E9B70638}"
 EndProject
 Global
        GlobalSection(SharedMSBuildProjectFiles) = preSolution
+               ..\Core\Core.projitems*{02cd8ce7-70e0-48cc-89a9-8863bf006dc7}*SharedItemsImports = 4
                ..\Core\Core.projitems*{c244f4e5-45d2-4c1f-bd2a-a5cc90d9421b}*SharedItemsImports = 13
-               ..\Core\Core.projitems*{cd4db9cc-9113-482b-8bbe-74e1b4032981}*SharedItemsImports = 4
        EndGlobalSection
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Any CPU = Debug|Any CPU
@@ -25,44 +25,47 @@ Global
                Release|x86 = Release|x86
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Debug|Any CPU.Build.0 = Debug|Any CPU
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Debug|ARM.ActiveCfg = Debug|ARM
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Debug|ARM.Build.0 = Debug|ARM
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Debug|x64.ActiveCfg = Debug|x64
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Debug|x64.Build.0 = Debug|x64
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Debug|x86.ActiveCfg = Debug|Any CPU
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Debug|x86.Build.0 = Debug|Any CPU
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Release|Any CPU.ActiveCfg = Release|Any CPU
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Release|Any CPU.Build.0 = Release|Any CPU
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Release|ARM.ActiveCfg = Release|ARM
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Release|ARM.Build.0 = Release|ARM
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Release|x64.ActiveCfg = Release|x64
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Release|x64.Build.0 = Release|x64
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Release|x86.ActiveCfg = Release|x86
-               {CD4DB9CC-9113-482B-8BBE-74E1B4032981}.Release|x86.Build.0 = Release|x86
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Debug|Any CPU.ActiveCfg = Debug|x86
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Debug|ARM.ActiveCfg = Debug|ARM
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Debug|ARM.Build.0 = Debug|ARM
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Debug|ARM.Deploy.0 = Debug|ARM
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Debug|x64.ActiveCfg = Debug|x64
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Debug|x64.Build.0 = Debug|x64
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Debug|x64.Deploy.0 = Debug|x64
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Debug|x86.ActiveCfg = Debug|x86
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Debug|x86.Build.0 = Debug|x86
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Debug|x86.Deploy.0 = Debug|x86
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Release|Any CPU.ActiveCfg = Release|x86
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Release|ARM.ActiveCfg = Release|ARM
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Release|ARM.Build.0 = Release|ARM
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Release|ARM.Deploy.0 = Release|ARM
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Release|x64.ActiveCfg = Release|x64
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Release|x64.Build.0 = Release|x64
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Release|x64.Deploy.0 = Release|x64
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Release|x86.ActiveCfg = Release|x86
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Release|x86.Build.0 = Release|x86
-               {7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}.Release|x86.Deploy.0 = Release|x86
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Debug|ARM.ActiveCfg = Debug|ARM
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Debug|ARM.Build.0 = Debug|ARM
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Debug|x64.ActiveCfg = Debug|x64
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Debug|x64.Build.0 = Debug|x64
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Debug|x86.ActiveCfg = Debug|x86
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Debug|x86.Build.0 = Debug|x86
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Release|Any CPU.Build.0 = Release|Any CPU
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Release|ARM.ActiveCfg = Release|ARM
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Release|ARM.Build.0 = Release|ARM
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Release|x64.ActiveCfg = Release|x64
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Release|x64.Build.0 = Release|x64
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Release|x86.ActiveCfg = Release|x86
+               {02CD8CE7-70E0-48CC-89A9-8863BF006DC7}.Release|x86.Build.0 = Release|x86
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Debug|Any CPU.ActiveCfg = Debug|x86
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Debug|ARM.ActiveCfg = Debug|ARM
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Debug|ARM.Build.0 = Debug|ARM
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Debug|ARM.Deploy.0 = Debug|ARM
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Debug|x64.ActiveCfg = Debug|x64
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Debug|x64.Build.0 = Debug|x64
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Debug|x64.Deploy.0 = Debug|x64
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Debug|x86.ActiveCfg = Debug|x86
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Debug|x86.Build.0 = Debug|x86
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Debug|x86.Deploy.0 = Debug|x86
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Release|Any CPU.ActiveCfg = Release|x86
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Release|ARM.ActiveCfg = Release|ARM
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Release|ARM.Build.0 = Release|ARM
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Release|ARM.Deploy.0 = Release|ARM
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Release|x64.ActiveCfg = Release|x64
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Release|x64.Build.0 = Release|x64
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Release|x64.Deploy.0 = Release|x64
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Release|x86.ActiveCfg = Release|x86
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Release|x86.Build.0 = Release|x86
+               {43300EA0-22C5-4396-AF6B-E071E9B70638}.Release|x86.Deploy.0 = Release|x86
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
        EndGlobalSection
+       GlobalSection(ExtensibilityGlobals) = postSolution
+               SolutionGuid = {C4074BDE-1FF9-443D-BE0A-6737751A7547}
+       EndGlobalSection
 EndGlobal
index eeb002d..2e1b287 100644 (file)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{CD4DB9CC-9113-482B-8BBE-74E1B4032981}</ProjectGuid>
+    <ProjectGuid>{02CD8CE7-70E0-48CC-89A9-8863BF006DC7}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FooEditEngine</RootNamespace>
+    <RootNamespace>FooEditEngine.UWP</RootNamespace>
     <AssemblyName>FooEditEngine.UWP</AssemblyName>
     <DefaultLanguage>ja-JP</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -23,7 +23,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;ENABLE_AUTMATION</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -32,7 +32,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;ENABLE_AUTMATION</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -40,7 +40,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;ENABLE_AUTMATION</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -50,7 +50,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <PlatformTarget>x86</PlatformTarget>
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;ENABLE_AUTMATION</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -62,7 +62,7 @@
     <PlatformTarget>ARM</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;ENABLE_AUTMATION</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>ARM</PlatformTarget>
@@ -72,7 +72,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
     <PlatformTarget>ARM</PlatformTarget>
     <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;ENABLE_AUTMATION</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -84,7 +84,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -94,7 +94,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;ENABLE_AUTMATION</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <None Include="project.json" />
-    <PRIResource Include="strings\ja-JP\Resources.resw" />
-    <PRIResource Include="strings\en-US\Resources.resw" />
-  </ItemGroup>
+  <PropertyGroup>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="AutoCompleteBox.cs" />
     <Compile Include="Direct2D\D2DRender.cs" />
     <EmbeddedResource Include="Properties\FooEditEngine.UWP.rd.xml" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>5.4.2</Version>
+    </PackageReference>
+    <PackageReference Include="SharpDX">
+      <Version>4.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="SharpDX.Direct2D1">
+      <Version>4.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="SharpDX.Direct3D11">
+      <Version>4.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="SharpDX.DXGI">
+      <Version>4.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="SharpDX.Mathematics">
+      <Version>4.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <PRIResource Include="strings\en-US\Resources.resw" />
+  </ItemGroup>
+  <ItemGroup>
+    <PRIResource Include="strings\ja-JP\Resources.resw" />
+  </ItemGroup>
   <Import Project="..\..\Core\Core.projitems" Label="Shared" />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
index c79aaa9..29658ed 100644 (file)
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    This file contains Runtime Directives, specifications about types your application accesses
-    through reflection and other dynamic code patterns. Runtime Directives are used to control the
-    .NET Native optimizer and ensure that it does not remove code accessed by your library. If your
-    library does not do any reflection, then you generally do not need to edit this file. However,
-    if your library reflects over types, especially types passed to it or derived from its types,
-    then you should write Runtime Directives.
+    このファイルには、リフレクションや他のダイナミック コード パターンを通してアプリケーション
+    がアクセスする型に関する仕様であるランタイム ディレクティブが含まれます。ランタイム ディレクティブは、
+    .NET ネイティブ オプティマイザーを制御し、ライブラリによってアクセスされるコードが削除されないようにします。ライブラリ
+    でリフレクションを実行しない場合、通常はこのファイルを編集する必要はありません。ただし、
+    ライブラリが型 (特にライブラリに渡された型またはライブラリの型から派生した型) にリフレクションを行う場合、
+    ランタイム ディレクティブを書き込む必要があります。
 
-    The most common use of reflection in libraries is to discover information about types passed
-    to the library. Runtime Directives have three ways to express requirements on types passed to
-    your library.
+    ライブラリ内でのリフレクションの最も一般的な使用目的は、ライブラリに渡された型に関する情報を検出する
+    ことです。ランタイム ディレクティブには、ライブラリに渡された型に要件を示すための方法
+    が 3 つあります。
 
-    1.  Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
-        Use these directives to reflect over types passed as a parameter.
+    1.  Parameter、GenericParameter、TypeParameter、TypeEnumerableParameter
+        これらのディレクティブを使って、パラメーターとして渡された型にリフレクトを行います。
 
     2.  SubTypes
-        Use a SubTypes directive to reflect over types derived from another type.
+        SubTypes ディレクティブを使って、別の型から派生した型にリフレクトを行います。
 
     3.  AttributeImplies
-        Use an AttributeImplies directive to indicate that your library needs to reflect over
-        types or methods decorated with an attribute.
+        AttributeImplies ディレクティブを使って、ライブラリが属性によって修飾された型またはメソッドに対して
+        リフレクトされる必要があることを示します。
 
-    For more information on writing Runtime Directives for libraries, please visit
-    http://go.microsoft.com/fwlink/?LinkID=391919
+    ライブラリのランタイム ディレクティブの記述方法の詳細については、https://go.microsoft.com/fwlink/?LinkID=391919
+    にアクセスしてください。
 -->
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
   <Library Name="FooEditEngine.UWP">
 
-       <!-- add directives for your library here -->
+       <!--ここにライブラリのディレクティブを追加する-->
 
   </Library>
 </Directives>
diff --git a/UWP/FooEditEngine.UWP/project.json b/UWP/FooEditEngine.UWP/project.json
deleted file mode 100644 (file)
index 42a9301..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.4.2",
-    "SharpDX": "4.0.1",
-    "SharpDX.Direct2D1": "4.0.1",
-    "SharpDX.Direct3D11": "4.0.1",
-    "SharpDX.DXGI": "4.0.1",
-    "SharpDX.Mathematics": "4.0.1"
-  },
-  "frameworks": {
-    "uap10.0.10586": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}
\ No newline at end of file
index 49114e6..a2b8cbd 100644 (file)
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{7AC0B8FA-FC01-4E52-BC06-923BE53C5ADF}</ProjectGuid>
+    <ProjectGuid>{43300EA0-22C5-4396-AF6B-E071E9B70638}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Test</RootNamespace>
     <AssemblyName>Test</AssemblyName>
     <DefaultLanguage>ja-JP</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <PackageCertificateKeyFile>Test_TemporaryKey.pfx</PackageCertificateKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <None Include="project.json" />
-  </ItemGroup>
+  <PropertyGroup>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>5.4.2</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FooEditEngine.UWP\FooEditEngine.UWP.csproj">
+      <Project>{02cd8ce7-70e0-48cc-89a9-8863bf006dc7}</Project>
+      <Name>FooEditEngine.UWP</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\FooEditEngine.UWP\FooEditEngine.UWP.csproj">
-      <Project>{cd4db9cc-9113-482b-8bbe-74e1b4032981}</Project>
-      <Name>FooEditEngine.UWP</Name>
-    </ProjectReference>
-  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
index f099852..1219cb5 100644 (file)
Binary files a/UWP/Test/Test_TemporaryKey.pfx and b/UWP/Test/Test_TemporaryKey.pfx differ
diff --git a/UWP/Test/project.json b/UWP/Test/project.json
deleted file mode 100644 (file)
index 74f2e74..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.4.2"
-  },
-  "frameworks": {
-    "uap10.0.14393": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}
\ No newline at end of file