Don't use .NET Core SDK preview anymore.

gibbed · May 30, 2020 · e2a9b46 · e2a9b46
1 parent 351585f
commit e2a9b46
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 19 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -22,7 +22,6 @@ cache:
   - '%LocalAppData%\NuGet\v3-cache'
 
 install:
-  - choco install dotnetcore-sdk --pre -y -r
   - git submodule update --init --recursive
 
 configuration:

diff --git a/global.json b/global.json
diff --git a/projects/Gibbed.Borderlands2.SaveEdit/Gibbed.Borderlands2.SaveEdit.csproj b/projects/Gibbed.Borderlands2.SaveEdit/Gibbed.Borderlands2.SaveEdit.csproj
@@ -16,6 +16,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <Configurations>Debug;Release;SaveEdit Packaging</Configurations>
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <UseWpf>true</UseWpf>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\..\bin\</OutputPath>
@@ -98,19 +99,6 @@
     <Resource Include="Resources\Xceed.Wpf.Toolkit\PropertyGrid\Images\SortAscending16.png" />
     <Resource Include="Resources\Xceed.Wpf.Toolkit\PropertyGrid\Images\Style11.png" />
   </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </ApplicationDefinition>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="**\*.xaml" Exclude="App.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </Page>
-    <Compile Update="**\*.xaml.cs" SubType="Code" DependentUpon="%(Filename)" />
-  </ItemGroup>
   <Target Name="RemoveBadReferencedAssemblies" AfterTargets="ResolveAssemblyReferences" Condition="'$(Configuration)'!='SaveEdit Packaging'">
     <ItemGroup>
       <AssembliesToEmbed Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Extension)'=='.dll'" />