Skip to content

Commit 17c935c

Browse files
punker76punker76
authored
Merge pull request #3232 from MahApps/develop
Merging changes for v1.6.2
2 parents c99301f + 18609a8 commit 17c935c

File tree

543 files changed

+965
-5586
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

543 files changed

+965
-5586
lines changed

‎src/.paket/Paket.Restore.targets‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@
4848

4949
<!-- Because ReadAllText is slow on osx/linux, try to find shasum and awk -->
5050
<PropertyGroup>
51-
<PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketRestoreCacheFile) | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher>
52-
<PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketLockFilePath) | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher>
51+
<PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketRestoreCacheFile) | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher>
52+
<PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketLockFilePath) | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher>
5353
</PropertyGroup>
5454

5555
<!-- If shasum and awk exist get the hashes -->
5656
<Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
57-
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
57+
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
5858
</Exec>
5959
<Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
60-
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
60+
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
6161
</Exec>
6262

6363
<PropertyGroup Condition="Exists('$(PaketRestoreCacheFile)') ">
@@ -127,6 +127,7 @@
127127
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
128128
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
129129
<PrivateAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'true'">All</PrivateAssets>
130+
<ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
130131
</PackageReference>
131132
</ItemGroup>
132133

@@ -183,8 +184,8 @@
183184

184185
<ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">
185186
<Output TaskParameter="AbsolutePaths" PropertyName="NuspecFileAbsolutePath" />
186-
</ConvertToAbsolutePath>
187-
187+
</ConvertToAbsolutePath>
188+
188189

189190
<!-- Call Pack -->
190191
<PackTask Condition="$(UseNewPack)"

‎src/.paket/paket.bootstrapper.exe‎

0 Bytes
Binary file not shown.

‎src/.paket/paket.exe‎

25 KB
Binary file not shown.

‎src/Directory.build.props‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project>
2+
<!-- workaround for https://github.com/NuGet/Home/issues/5894 -->
3+
<PropertyGroup>
4+
<_SdkLanguageName>CSharp</_SdkLanguageName>
5+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
6+
</PropertyGroup>
7+
<Import Condition=" '$(MSBuildProjectExtension)' == '.tmp_proj'" Project="obj\*.props"/>
8+
<!-- Project properties -->
9+
<PropertyGroup>
10+
<TargetFrameworks>net47;net46;net45;net40</TargetFrameworks>
11+
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
12+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
13+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
14+
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
15+
</PropertyGroup>
16+
<ItemGroup>
17+
<None Remove="**\*.png;**\*.jpg;**\*.ico"/>
18+
<Resource Include="**\*.png;**\*.jpg;**\*.ico"/>
19+
</ItemGroup>
20+
<!-- workaround for https://github.com/NuGet/Home/issues/5894 -->
21+
<Import Condition=" '$(MSBuildProjectExtension)' == '.tmp_proj'" Project="obj\*.targets"/>
22+
</Project>

‎src/Directory.build.targets‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<Project>
2+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
3+
<DefineConstants>NET40;NET4</DefineConstants>
4+
</PropertyGroup>
5+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
6+
<DefineConstants>NET45;NET4_5</DefineConstants>
7+
</PropertyGroup>
8+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
9+
<DefineConstants>NET46;NET4_5</DefineConstants>
10+
</PropertyGroup>
11+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net47' ">
12+
<DefineConstants>NET47;NET4_5</DefineConstants>
13+
</PropertyGroup>
14+
15+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
16+
<NoWarn>1591</NoWarn>
17+
<DebugType>full</DebugType>
18+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
19+
</PropertyGroup>
20+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
21+
<NoWarn>1591</NoWarn>
22+
<DebugType>pdbonly</DebugType>
23+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
24+
</PropertyGroup>
25+
</Project>

‎src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET40/App.config‎ renamed to ‎src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/App.net40.config‎

File renamed without changes.

‎src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET45/App.config‎ renamed to ‎src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/App.net45.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />

‎src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/App.net46.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
5+
</startup>
6+
</configuration>

‎src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/App.net47.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
5+
</startup>
6+
</configuration>

‎src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.Shared/App.xaml‎ renamed to ‎src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/App.xaml‎

File renamed without changes.

0 commit comments

Comments
 (0)