• R/O
  • HTTP
  • SSH
  • HTTPS

FooEditor: Commit


Commit MetaInfo

Revision0da9af4f9a6c611798741d3de9a3acee95401700 (tree)
Time2017-12-10 22:39:53
Authorsabinekonya <test@hotm...>
Commitersabinekonya

Log Message

Windows10 1706移行で動くようにした

Change Summary

Incremental Difference

--- a/UWP/FooEditor.UWP/FooEditor.UWP.csproj
+++ b/UWP/FooEditor.UWP/FooEditor.UWP.csproj
@@ -11,7 +11,7 @@
1111 <AssemblyName>FooEditor.UWP</AssemblyName>
1212 <DefaultLanguage>ja-JP</DefaultLanguage>
1313 <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14- <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
14+ <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
1515 <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
1616 <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717 <FileAlignment>512</FileAlignment>
--- a/UWP/FooEditor.UWP/FooEditor.UWP.nuget.props
+++ b/UWP/FooEditor.UWP/FooEditor.UWP.nuget.props
@@ -4,18 +4,18 @@
44 <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
55 <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
66 <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">D:\matin\Documents\Visual Studio 2013\Projects\FooEditor\UWP\FooEditor.UWP\project.lock.json</ProjectAssetsFile>
7- <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
8- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\matin\.nuget\packages\</NuGetPackageFolders>
7+ <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">D:\NuGet</NuGetPackageRoot>
8+ <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">D:\NuGet;C:\Program Files (x86)\Microsoft SDKs\NuGetPackagesFallback\</NuGetPackageFolders>
99 <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">ProjectJson</NuGetProjectStyle>
10- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.4.0</NuGetToolVersion>
10+ <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.5.0</NuGetToolVersion>
1111 </PropertyGroup>
1212 <PropertyGroup>
1313 <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
1414 </PropertyGroup>
1515 <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
16- <Import Project="$(NuGetPackageRoot)microsoft.net.native.sharedlibrary-x86\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x86.props" Condition="Exists('$(NuGetPackageRoot)microsoft.net.native.sharedlibrary-x86\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x86.props')" />
17- <Import Project="$(NuGetPackageRoot)microsoft.net.native.sharedlibrary-x64\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x64.props" Condition="Exists('$(NuGetPackageRoot)microsoft.net.native.sharedlibrary-x64\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x64.props')" />
18- <Import Project="$(NuGetPackageRoot)microsoft.net.native.sharedlibrary-arm\1.6.1\build\Microsoft.Net.Native.SharedLibrary-arm.props" Condition="Exists('$(NuGetPackageRoot)microsoft.net.native.sharedlibrary-arm\1.6.1\build\Microsoft.Net.Native.SharedLibrary-arm.props')" />
19- <Import Project="$(NuGetPackageRoot)microsoft.net.native.compiler\1.6.2\build\Microsoft.Net.Native.Compiler.props" Condition="Exists('$(NuGetPackageRoot)microsoft.net.native.compiler\1.6.2\build\Microsoft.Net.Native.Compiler.props')" />
16+ <Import Project="$(NuGetPackageRoot)\microsoft.net.native.sharedlibrary-x86\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x86.props" Condition="Exists('$(NuGetPackageRoot)\microsoft.net.native.sharedlibrary-x86\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x86.props')" />
17+ <Import Project="$(NuGetPackageRoot)\microsoft.net.native.sharedlibrary-x64\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x64.props" Condition="Exists('$(NuGetPackageRoot)\microsoft.net.native.sharedlibrary-x64\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x64.props')" />
18+ <Import Project="$(NuGetPackageRoot)\microsoft.net.native.sharedlibrary-arm\1.6.1\build\Microsoft.Net.Native.SharedLibrary-arm.props" Condition="Exists('$(NuGetPackageRoot)\microsoft.net.native.sharedlibrary-arm\1.6.1\build\Microsoft.Net.Native.SharedLibrary-arm.props')" />
19+ <Import Project="$(NuGetPackageRoot)\microsoft.net.native.compiler\1.6.2\build\Microsoft.Net.Native.Compiler.props" Condition="Exists('$(NuGetPackageRoot)\microsoft.net.native.compiler\1.6.2\build\Microsoft.Net.Native.Compiler.props')" />
2020 </ImportGroup>
2121 </Project>
\ No newline at end of file
--- a/UWP/FooEditor.UWP/FooEditor.UWP.nuget.targets
+++ b/UWP/FooEditor.UWP/FooEditor.UWP.nuget.targets
@@ -4,9 +4,9 @@
44 <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
55 </PropertyGroup>
66 <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
7- <Import Project="$(NuGetPackageRoot)microsoft.net.native.sharedlibrary-x86\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x86.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.net.native.sharedlibrary-x86\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x86.targets')" />
8- <Import Project="$(NuGetPackageRoot)microsoft.net.native.sharedlibrary-x64\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x64.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.net.native.sharedlibrary-x64\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x64.targets')" />
9- <Import Project="$(NuGetPackageRoot)microsoft.net.native.sharedlibrary-arm\1.6.1\build\Microsoft.Net.Native.SharedLibrary-arm.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.net.native.sharedlibrary-arm\1.6.1\build\Microsoft.Net.Native.SharedLibrary-arm.targets')" />
10- <Import Project="$(NuGetPackageRoot)microsoft.net.native.compiler\1.6.2\build\Microsoft.Net.Native.Compiler.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.net.native.compiler\1.6.2\build\Microsoft.Net.Native.Compiler.targets')" />
7+ <Import Project="$(NuGetPackageRoot)\microsoft.net.native.sharedlibrary-x86\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x86.targets" Condition="Exists('$(NuGetPackageRoot)\microsoft.net.native.sharedlibrary-x86\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x86.targets')" />
8+ <Import Project="$(NuGetPackageRoot)\microsoft.net.native.sharedlibrary-x64\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x64.targets" Condition="Exists('$(NuGetPackageRoot)\microsoft.net.native.sharedlibrary-x64\1.6.1\build\Microsoft.Net.Native.SharedLibrary-x64.targets')" />
9+ <Import Project="$(NuGetPackageRoot)\microsoft.net.native.sharedlibrary-arm\1.6.1\build\Microsoft.Net.Native.SharedLibrary-arm.targets" Condition="Exists('$(NuGetPackageRoot)\microsoft.net.native.sharedlibrary-arm\1.6.1\build\Microsoft.Net.Native.SharedLibrary-arm.targets')" />
10+ <Import Project="$(NuGetPackageRoot)\microsoft.net.native.compiler\1.6.2\build\Microsoft.Net.Native.Compiler.targets" Condition="Exists('$(NuGetPackageRoot)\microsoft.net.native.compiler\1.6.2\build\Microsoft.Net.Native.Compiler.targets')" />
1111 </ImportGroup>
1212 </Project>
\ No newline at end of file
--- a/UWP/FooEditor.UWP/project.lock.json
+++ b/UWP/FooEditor.UWP/project.lock.json
@@ -26218,7 +26218,8 @@
2621826218 "UAP,Version=v10.0.14393": []
2621926219 },
2622026220 "packageFolders": {
26221- "C:\\Users\\matin\\.nuget\\packages\\": {}
26221+ "D:\\NuGet": {},
26222+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackagesFallback\\": {}
2622226223 },
2622326224 "project": {
2622426225 "restore": {
@@ -26226,12 +26227,16 @@
2622626227 "projectName": "FooEditor.UWP",
2622726228 "projectPath": "D:\\matin\\Documents\\Visual Studio 2013\\Projects\\FooEditor\\UWP\\FooEditor.UWP\\FooEditor.UWP.csproj",
2622826229 "projectJsonPath": "D:\\matin\\Documents\\Visual Studio 2013\\Projects\\FooEditor\\UWP\\FooEditor.UWP\\project.json",
26229- "packagesPath": "C:\\Users\\matin\\.nuget\\packages\\",
26230+ "packagesPath": "D:\\NuGet",
2623026231 "outputPath": "D:\\matin\\Documents\\Visual Studio 2013\\Projects\\FooEditor\\UWP\\FooEditor.UWP\\obj\\",
2623126232 "projectStyle": "ProjectJson",
26233+ "fallbackFolders": [
26234+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackagesFallback\\"
26235+ ],
2623226236 "configFilePaths": [
2623326237 "C:\\Users\\matin\\AppData\\Roaming\\NuGet\\NuGet.Config",
26234- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
26238+ "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
26239+ "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.Fallback.config"
2623526240 ],
2623626241 "sources": {
2623726242 "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
@@ -26248,13 +26253,13 @@
2624826253 }
2624926254 },
2625026255 "dependencies": {
26251- "HockeySDK.UWP": "4.1.6",
26252- "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3",
26253- "Microsoft.Toolkit.Uwp.Notifications": "1.4.1",
26254- "Prism.Unity": "6.3.0",
26255- "Prism.Windows": "6.3.0",
26256- "System.Text.Encoding.CodePages": "4.3.0",
26257- "WinRTXamlToolkit.UWP": "2.3.0"
26256+ "HockeySDK.UWP": "[4.1.6, )",
26257+ "Microsoft.NETCore.UniversalWindowsPlatform": "[5.3.3, )",
26258+ "Microsoft.Toolkit.Uwp.Notifications": "[1.4.1, )",
26259+ "Prism.Unity": "[6.3.0, )",
26260+ "Prism.Windows": "[6.3.0, )",
26261+ "System.Text.Encoding.CodePages": "[4.3.0, )",
26262+ "WinRTXamlToolkit.UWP": "[2.3.0, )"
2625826263 },
2625926264 "frameworks": {
2626026265 "uap10.0.14393": {}
Show on old repository browser