Update build scripts to work

YarnSpinnerTool · Jan 7, 2020 · fc82421 · fc82421
1 parent e1681e5
commit fc82421
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/YarnSpinner/YarnSpinner.csproj b/YarnSpinner/YarnSpinner.csproj
@@ -14,7 +14,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Yarn</RootNamespace>
     <AssemblyName>YarnSpinner</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>  
     <ReleaseVersion>0.9</ReleaseVersion>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -40,6 +40,7 @@
     <CodeAnalysisRuleSet>
     </CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
+    <TargetFrameworks>.NETFramework,Version=v3.5</TargetFrameworks>  
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/build.sh b/build.sh
@@ -61,8 +61,8 @@ init_build () {
     XBUILD_ARGS="/verbosity:${VERBOSITY} /p:Configuration=${CONFIGURATION}"
     if [ "${OSTYPE}" = "linux-gnu" ]; then
         FAILED_PREREQ=""
-        if [ ! $(which xbuild) ]; then
-            echo "xbuild not installed or not in \$PATH"
+        if [ ! $(which msbuild) ]; then
+            echo "msbuild not installed or not in \$PATH"
             FAILED_PREREQ="true"
         fi
         if [ ! $(which nuget) ]; then
@@ -80,7 +80,7 @@ done
 
 clean_yarnspinner () {
     if [ -f YarnSpinner/bin/${CONFIGURATION}/YarnSpinner.dll ]; then
-        xbuild ${XBUILD_ARGS} /target:clean YarnSpinner.sln
+        msbuild ${XBUILD_ARGS} /target:clean YarnSpinner.sln
     fi
     echo "Cleaning documentation"
     rm -fvr Documentation/{docbook,html,latex,rtf,xml}
@@ -90,10 +90,10 @@ clean_yarnspinner () {
 
 build_yarnspinner () {
     nuget restore YarnSpinner.sln
-    xbuild ${XBUILD_ARGS} YarnSpinner.sln
+    msbuild ${XBUILD_ARGS} YarnSpinner.sln
 
     if [ $? -ne 0 ]; then
-        echo "Error during: xbuild ${XBUILD_ARGS}"
+        echo "Error during: msbuild ${XBUILD_ARGS}"
         exit 1
     fi
 

diff --git a/package.sh b/package.sh
@@ -151,7 +151,7 @@ echo "Packaging Version $FULL_VERSION with Unity..."
 
 OUTFILE="$OUTDIR/YarnSpinner-$FULL_VERSION.unitypackage"
 
-UNITY="/Applications/Unity_2019.1.8f1/Unity.app"
+UNITY="/Applications/2019.2.10f1/Unity.app"
 UNITY_BINARY="$UNITY/Contents/MacOS/Unity"
 
 if [[ -f $UNITY_BINARY ]]; then