nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5160 from larsbrubaker/main

Browse source 
adding  <RuntimeIdentifier>win</RuntimeIdentifier>
This commit is contained in:
Lars Brubaker 2021-11-18 22:01:22 -08:00 • committed by GitHub
commit fdcebacbc3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
MatterControl.csproj
View file

@ -9,7 +9,8 @@
<RootNamespace>MatterControl</RootNamespace>
<AssemblyName>MatterControl</AssemblyName>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<RuntimeIdentifier>win</RuntimeIdentifier>
<FileAlignment>512</FileAlignment>
<!--See the following for details on netstandard2 binding workround: https://github.com/dotnet/standard/issues/481-->
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 33920643b0090049b397a34220a6154cdc39e1e1
Subproject commit f010c985ba1978c5b769fc2f8fe8e0766f79838f

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 1c02acca83e375dc553b149a2da9d0ce12595e70
Subproject commit 628760e12e9a38dce1d8ae6d8b3a4860dad22320

3
Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj
View file

@ -18,7 +18,8 @@
<RootNamespace>MatterControl.AutomationTests</RootNamespace>
<AssemblyName>MatterControl.AutomationTests</AssemblyName>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<RuntimeIdentifier>win</RuntimeIdentifier>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">