Skip to content

Commit 6882e24

Browse files
authored
Merge pull request #2 from dotnet/dev/stevenki/system_xaml
initial commit of system.xaml closes #3
2 parents 6e5b548 + d4c1d0a commit 6882e24

File tree

404 files changed

+125406
-64
lines changed

Some content is hidden

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

404 files changed

+125406
-64
lines changed

.gitignore

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ BenchmarkDotNet.Artifacts/
5252
project.lock.json
5353
project.fragment.lock.json
5454
artifacts/
55-
.dotnet/
55+
**/Properties/launchSettings.json
5656

5757
# StyleCop
5858
StyleCopReport.xml
@@ -179,7 +179,6 @@ PublishScripts/
179179

180180
# NuGet Packages
181181
*.nupkg
182-
.packages/
183182
# The packages folder can be ignored because of Package Restore
184183
**/[Pp]ackages/*
185184
# except build/, which is used as an MSBuild target.
@@ -222,7 +221,7 @@ ClientBin/
222221
*.publishsettings
223222
orleans.codegen.cs
224223

225-
# Including strong name files can present a security risk
224+
# Including strong name files can present a security risk
226225
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
227226
#*.snk
228227

@@ -318,7 +317,7 @@ __pycache__/
318317
# OpenCover UI analysis results
319318
OpenCover/
320319

321-
# Azure Stream Analytics local run output
320+
# Azure Stream Analytics local run output
322321
ASALocalRun/
323322

324323
# MSBuild Binary and Structured Log
@@ -327,5 +326,8 @@ ASALocalRun/
327326
# NVidia Nsight GPU debugger configuration file
328327
*.nvuser
329328

330-
# MFractors (Xamarin productivity tool) working folder
329+
# MFractors (Xamarin productivity tool) working folder
331330
.mfractor/
331+
/.dotnet
332+
/.packages
333+
/.tools/vswhere/2.5.2

Directory.Build.props

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,20 @@
22
<Project>
33
<PropertyGroup>
44
<ImportNetSdkFromRepoToolset>false</ImportNetSdkFromRepoToolset>
5+
6+
<!-- This repo builds a transport package - we don't ship from here -->
7+
<IsShipping Condition="'$(IsShipping)'==''">false</IsShipping>
8+
9+
<!-- Disable localization - re-enable this later when localization is needed -->
10+
<EnableXlfLocalization>false</EnableXlfLocalization>
11+
12+
<PublishWindowsPdb>true</PublishWindowsPdb>
513
</PropertyGroup>
614

15+
<Import Project="$(MsBuildThisFileDirectory)SystemResources.props"/>
716
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
17+
18+
<PropertyGroup>
19+
<DebugType>full</DebugType>
20+
</PropertyGroup>
821
</Project>

Directory.Build.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
4+
<Import Project="$(MSBuildThisFileDirectory)Packaging.targets" />
5+
<Import Project="$(MSBuildThisFileDirectory)Publishing.targets" />
46
</Project>

HelloWorld.sln

Lines changed: 0 additions & 25 deletions
This file was deleted.

HelloWorld/HelloWorld.csproj

Lines changed: 0 additions & 9 deletions
This file was deleted.

Microsoft.Dotnet.Wpf.sln

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28010.2048
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xaml", "src\Microsoft.DotNet.Wpf\src\System.Xaml\System.Xaml.csproj", "{9AC36357-34B7-40A1-95CA-FE9F46D089A7}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Debug|x64 = Debug|x64
12+
Debug|x86 = Debug|x86
13+
Release|Any CPU = Release|Any CPU
14+
Release|x64 = Release|x64
15+
Release|x86 = Release|x86
16+
EndGlobalSection
17+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18+
{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19+
{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
20+
{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Debug|x64.ActiveCfg = Debug|x64
21+
{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Debug|x64.Build.0 = Debug|x64
22+
{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Debug|x86.ActiveCfg = Debug|Any CPU
23+
{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Debug|x86.Build.0 = Debug|Any CPU
24+
{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
25+
{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Release|x64.ActiveCfg = Release|x64
27+
{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Release|x64.Build.0 = Release|x64
28+
{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Release|x86.ActiveCfg = Release|Any CPU
29+
{9AC36357-34B7-40A1-95CA-FE9F46D089A7}.Release|x86.Build.0 = Release|Any CPU
30+
EndGlobalSection
31+
GlobalSection(SolutionProperties) = preSolution
32+
HideSolutionNode = FALSE
33+
EndGlobalSection
34+
GlobalSection(ExtensibilityGlobals) = postSolution
35+
SolutionGuid = {671D19D1-5F0E-4453-9D18-3A28AC0E8DEF}
36+
EndGlobalSection
37+
EndGlobal

Packaging.targets

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<Project>
2+
<!--
3+
<Target Name="PreparePackageAssets" AfterTargets="Build">
4+
<ItemGroup Condition="'$(IncludeInPackage)' != ''">
5+
<PackageAsset Include="$(TargetPath)"
6+
RelativePath="$(IncludeInPackage)\lib\$(TargetFramework)" />
7+
8+
<PackageAsset Include="@(DebugSymbolsProjectOutputGroupOutput)"
9+
RelativePath="$(IncludeInPackage)\lib\$(TargetFramework)" />
10+
11+
<PackageAsset Include="@(DocumentationProjectOutputGroupOutput)"
12+
RelativePath="$(IncludeInPackage)\lib\$(TargetFramework)" />
13+
</ItemGroup>
14+
15+
<ItemGroup Condition="'$(IncludeAnalyzerInPackage)' != ''">
16+
<PackageAsset Include="$(TargetPath)"
17+
RelativePath="$(IncludeAnalyzerInPackage)\analyzers\dotnet\cs" />
18+
<PackageAsset Include="@(DebugSymbolsProjectOutputGroupOutput)"
19+
RelativePath="$(IncludeAnalyzerInPackage)\analyzers\dotnet\cs" />
20+
</ItemGroup>
21+
22+
<Copy SourceFiles="@(PackageAsset)"
23+
DestinationFolder="$(ArtifactsPackagesDir)%(PackageAsset.RelativePath)" />
24+
</Target>
25+
-->
26+
</Project>

Publishing.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Target Name="_CorePublish" DependsOnTargets="Publish" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
3+
</Project>

SystemResources.props

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<ItemDefinitionGroup>
4+
<EmbeddedResource>
5+
<GenerateSource>true</GenerateSource>
6+
<ManifestResourceName>FxResources.$(AssemblyName).SR</ManifestResourceName>
7+
<GenerateResourcesCodeAsConstants>true</GenerateResourcesCodeAsConstants>
8+
9+
<ClassName Condition="'$(AssemblyName)'=='PresentationBuildTasks'">MS.Utility.SRID</ClassName>
10+
<ClassName Condition="'$(AssemblyName)'=='UIAutomationProvider'">System.SR</ClassName>
11+
<ClassName Condition="'$(AssemblyName)'=='UIAutomationTypes'">System.SR</ClassName>
12+
<ClassName Condition="'$(AssemblyName)'=='WindowsBase'">MS.Internal.WindowsBase.SRID</ClassName>
13+
<ClassName Condition="'$(AssemblyName)'=='System.Windows.Controls.Ribbon'">Microsoft.Windows.Controls.SRID</ClassName>
14+
<ClassName Condition="'$(AssemblyName)'=='System.Windows.Input.Manipulations'">System.SR</ClassName>
15+
<ClassName Condition="'$(AssemblyName)'=='ReachFramework'">System.Windows.Xps.SRID</ClassName>
16+
<ClassName Condition="'$(AssemblyName)'=='PresentationFramework'">System.Windows.SRID</ClassName>
17+
<ClassName Condition="'$(AssemblyName)'=='PresentationUI'">System.Windows.TrustUI.SRID</ClassName>
18+
<ClassName Condition="'$(AssemblyName)'=='WindowsFormsIntegration'">System.Windows.SRID</ClassName>
19+
<ClassName Condition="'$(AssemblyName)'=='PresentationCore'">MS.Internal.PresentationCore.SRID </ClassName>
20+
<Classname Condition="'%(ClassName)'==''">System.SRID</Classname>
21+
</EmbeddedResource>
22+
</ItemDefinitionGroup>
23+
</Project>
24+

Test.cmd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@echo off
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -test %*"
3+
exit /b %ErrorLevel%

0 commit comments

Comments
 (0)