Unity 2017

neuecc · Jul 3, 2017 · 0178953 · 0178953
1 parent 3fa61e0
commit 0178953
Show file tree

Hide file tree

Showing 12 changed files with 812 additions and 196 deletions.
diff --git a/Analyzer/UniRxAnalyzer/UniRxAnalyzer.Vsix/UniRxAnalyzer.Vsix.csproj b/Analyzer/UniRxAnalyzer/UniRxAnalyzer.Vsix/UniRxAnalyzer.Vsix.csproj
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>14.0</OldToolsVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

diff --git a/Assets/AssetStoreTools/Editor/AssetStoreTools.dll b/Assets/AssetStoreTools/Editor/AssetStoreTools.dll
diff --git a/Assets/AssetStoreTools/Editor/AssetStoreTools.dll.meta b/Assets/AssetStoreTools/Editor/AssetStoreTools.dll.meta
diff --git a/Assets/Scripts/Tests/Imported/TestImporter.cs b/Assets/Scripts/Tests/Imported/TestImporter.cs
@@ -3847,7 +3847,7 @@ public void FinishedSourceToReactiveProperty()
                 }
                 // immediate
                 {
-                    var ex = new Exception();
+                    // var ex = new Exception();
                     var source = new Subject<int>();
                     var rxProp = source.ToReactiveProperty();
                     var record = rxProp.Record();
@@ -3892,7 +3892,7 @@ public void FinishedSourceToReadOnlyReactiveProperty()
                 }
                 // immediate
                 {
-                    var ex = new Exception();
+                    // var ex = new Exception();
                     var source = new Subject<int>();
                     var rxProp = source.ToReadOnlyReactiveProperty();
                     var record = rxProp.Record();
@@ -4637,9 +4637,9 @@ public void SelectSelect()
         {
             SetScehdulerForImport();
             // Combine selector currently disabled.
-            var selectselect = Observable.Range(1, 10)
-                .Select(x => x)
-                .Select(x => x * -1);
+            //var selectselect = Observable.Range(1, 10)
+            //    .Select(x => x)
+            //    .Select(x => x * -1);
             UniRx.Scheduler.SetDefaultForUnity();
         }