Skip to content

Commit 6882e24

Browse files
stevenbrixstevenbrix
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%

‎Tests.sln

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.28010.2026
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrtXaml.Tests", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\DrtXaml\DrtXaml.Tests.csproj", "{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestServices", "src\Microsoft.DotNet.Wpf\test\Common\TestServices\TestServices.csproj", "{387F3700-8C0B-4CEC-A68A-1725F656A249}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlTestClasses", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\XamlTestClasses\XamlTestClasses.csproj", "{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}"
11+
EndProject
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlTestClasses.FriendWithKey", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\XamlTestClasses.FriendWithKey\XamlTestClasses.FriendWithKey.csproj", "{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}"
13+
EndProject
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlTestClasses.FriendWithoutKey", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\XamlTestClasses.FriendWithoutKey\XamlTestClasses.FriendWithoutKey.csproj", "{7D204145-BB36-4239-AD55-24DCE26BE997}"
15+
EndProject
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BamlTestClasses40", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\BamlTestClasses40\BamlTestClasses40.csproj", "{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}"
17+
EndProject
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BamlAvoidXmlTest", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\BamlAvoidXmlTest\BamlAvoidXmlTest.csproj", "{9163F98E-E941-45F5-9A57-47F375F50333}"
19+
EndProject
20+
Global
21+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
22+
Debug|Any CPU = Debug|Any CPU
23+
Debug|x64 = Debug|x64
24+
Debug|x86 = Debug|x86
25+
Release|Any CPU = Release|Any CPU
26+
Release|x64 = Release|x64
27+
Release|x86 = Release|x86
28+
EndGlobalSection
29+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30+
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Debug|x64.ActiveCfg = Debug|x64
33+
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Debug|x64.Build.0 = Debug|x64
34+
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Debug|x86.ActiveCfg = Debug|Any CPU
35+
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Debug|x86.Build.0 = Debug|Any CPU
36+
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
37+
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Release|Any CPU.Build.0 = Release|Any CPU
38+
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Release|x64.ActiveCfg = Release|x64
39+
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Release|x64.Build.0 = Release|x64
40+
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Release|x86.ActiveCfg = Release|Any CPU
41+
{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}.Release|x86.Build.0 = Release|Any CPU
42+
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Debug|x64.ActiveCfg = Debug|x64
45+
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Debug|x64.Build.0 = Debug|x64
46+
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Debug|x86.ActiveCfg = Debug|Any CPU
47+
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Debug|x86.Build.0 = Debug|Any CPU
48+
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Release|Any CPU.Build.0 = Release|Any CPU
50+
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Release|x64.ActiveCfg = Release|x64
51+
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Release|x64.Build.0 = Release|x64
52+
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Release|x86.ActiveCfg = Release|Any CPU
53+
{387F3700-8C0B-4CEC-A68A-1725F656A249}.Release|x86.Build.0 = Release|Any CPU
54+
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55+
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Debug|Any CPU.Build.0 = Debug|Any CPU
56+
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Debug|x64.ActiveCfg = Debug|x64
57+
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Debug|x64.Build.0 = Debug|x64
58+
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Debug|x86.ActiveCfg = Debug|Any CPU
59+
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Debug|x86.Build.0 = Debug|Any CPU
60+
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Release|Any CPU.ActiveCfg = Release|Any CPU
61+
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Release|Any CPU.Build.0 = Release|Any CPU
62+
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Release|x64.ActiveCfg = Release|x64
63+
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Release|x64.Build.0 = Release|x64
64+
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Release|x86.ActiveCfg = Release|Any CPU
65+
{3C1FC36C-E3E6-4EED-9ECA-CFF2EB950486}.Release|x86.Build.0 = Release|Any CPU
66+
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67+
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
68+
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Debug|x64.ActiveCfg = Debug|x64
69+
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Debug|x64.Build.0 = Debug|x64
70+
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Debug|x86.ActiveCfg = Debug|Any CPU
71+
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Debug|x86.Build.0 = Debug|Any CPU
72+
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
73+
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Release|Any CPU.Build.0 = Release|Any CPU
74+
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Release|x64.ActiveCfg = Release|x64
75+
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Release|x64.Build.0 = Release|x64
76+
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Release|x86.ActiveCfg = Release|Any CPU
77+
{BA5AFF97-E993-49CB-BD2D-593F85E83FD5}.Release|x86.Build.0 = Release|Any CPU
78+
{7D204145-BB36-4239-AD55-24DCE26BE997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79+
{7D204145-BB36-4239-AD55-24DCE26BE997}.Debug|Any CPU.Build.0 = Debug|Any CPU
80+
{7D204145-BB36-4239-AD55-24DCE26BE997}.Debug|x64.ActiveCfg = Debug|x64
81+
{7D204145-BB36-4239-AD55-24DCE26BE997}.Debug|x64.Build.0 = Debug|x64
82+
{7D204145-BB36-4239-AD55-24DCE26BE997}.Debug|x86.ActiveCfg = Debug|Any CPU
83+
{7D204145-BB36-4239-AD55-24DCE26BE997}.Debug|x86.Build.0 = Debug|Any CPU
84+
{7D204145-BB36-4239-AD55-24DCE26BE997}.Release|Any CPU.ActiveCfg = Release|Any CPU
85+
{7D204145-BB36-4239-AD55-24DCE26BE997}.Release|Any CPU.Build.0 = Release|Any CPU
86+
{7D204145-BB36-4239-AD55-24DCE26BE997}.Release|x64.ActiveCfg = Release|x64
87+
{7D204145-BB36-4239-AD55-24DCE26BE997}.Release|x64.Build.0 = Release|x64
88+
{7D204145-BB36-4239-AD55-24DCE26BE997}.Release|x86.ActiveCfg = Release|Any CPU
89+
{7D204145-BB36-4239-AD55-24DCE26BE997}.Release|x86.Build.0 = Release|Any CPU
90+
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
91+
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
92+
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Debug|x64.ActiveCfg = Debug|x64
93+
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Debug|x64.Build.0 = Debug|x64
94+
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Debug|x86.ActiveCfg = Debug|Any CPU
95+
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Debug|x86.Build.0 = Debug|Any CPU
96+
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
97+
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Release|Any CPU.Build.0 = Release|Any CPU
98+
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Release|x64.ActiveCfg = Release|x64
99+
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Release|x64.Build.0 = Release|x64
100+
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Release|x86.ActiveCfg = Release|Any CPU
101+
{2127AC4D-78F4-44BE-A93F-8872EA9A8BB2}.Release|x86.Build.0 = Release|Any CPU
102+
{9163F98E-E941-45F5-9A57-47F375F50333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
103+
{9163F98E-E941-45F5-9A57-47F375F50333}.Debug|Any CPU.Build.0 = Debug|Any CPU
104+
{9163F98E-E941-45F5-9A57-47F375F50333}.Debug|x64.ActiveCfg = Debug|x64
105+
{9163F98E-E941-45F5-9A57-47F375F50333}.Debug|x64.Build.0 = Debug|x64
106+
{9163F98E-E941-45F5-9A57-47F375F50333}.Debug|x86.ActiveCfg = Debug|Any CPU
107+
{9163F98E-E941-45F5-9A57-47F375F50333}.Debug|x86.Build.0 = Debug|Any CPU
108+
{9163F98E-E941-45F5-9A57-47F375F50333}.Release|Any CPU.ActiveCfg = Release|Any CPU
109+
{9163F98E-E941-45F5-9A57-47F375F50333}.Release|Any CPU.Build.0 = Release|Any CPU
110+
{9163F98E-E941-45F5-9A57-47F375F50333}.Release|x64.ActiveCfg = Release|x64
111+
{9163F98E-E941-45F5-9A57-47F375F50333}.Release|x64.Build.0 = Release|x64
112+
{9163F98E-E941-45F5-9A57-47F375F50333}.Release|x86.ActiveCfg = Release|Any CPU
113+
{9163F98E-E941-45F5-9A57-47F375F50333}.Release|x86.Build.0 = Release|Any CPU
114+
EndGlobalSection
115+
GlobalSection(SolutionProperties) = preSolution
116+
HideSolutionNode = FALSE
117+
EndGlobalSection
118+
GlobalSection(ExtensibilityGlobals) = postSolution
119+
SolutionGuid = {B4340004-DAC0-497D-B69D-CFA7CD93F567}
120+
EndGlobalSection
121+
EndGlobal

‎azure-pipelines.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ variables:
1717
_PublishType: none
1818
_SignType: test
1919
_DotNetPublishToBlobFeed: false
20+
_IsShipping: false
2021
# else
2122
# TODO: Remove the Build.DefinitionName check once the github repo goes public
2223
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), not(contains(variables['Build.DefinitionName'], 'github'))) }}:
@@ -25,6 +26,7 @@ variables:
2526
_PublishType: blob
2627
_SignType: real
2728
_DotNetPublishToBlobFeed: true
29+
_IsShipping: true
2830

2931
# only trigger ci builds for the master branch
3032
trigger:

‎eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Dependencies>
33
<ProductDependencies></ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18526.8">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18556.6">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>ef208f75c0494f47bf79a317773adcb398c35f92</Sha>
7+
<Sha>7b0a1f028490bbf18ab1565998719315f2de22e7</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

‎eng/Versions.props

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<VersionPrefix>1.0.0</VersionPrefix>
4+
<VersionPrefix>3.0.0</VersionPrefix>
55
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
6+
7+
<FileVersion Condition="'$(VersionSuffixDateStamp)'!=''">4.8.$(VersionSuffixDateStamp).0</FileVersion>
8+
<FileVersion Condition="'$(FileVersion)'==''">4.8.0.0</FileVersion>
9+
10+
<AssemblyVersion>4.0.0.0</AssemblyVersion>
11+
12+
<SystemSecurityVersion>4.5.0</SystemSecurityVersion>
13+
<SystemReflectionEmitVersion>4.3.0</SystemReflectionEmitVersion>
14+
<XUnitVersion>2.4.0</XUnitVersion>
15+
<XUnitRunnerConsoleVersion>2.4.0</XUnitRunnerConsoleVersion>
16+
<XUnitRunnerVisualStudioVersion>2.4.0</XUnitRunnerVisualStudioVersion>
617
</PropertyGroup>
718
</Project>

0 commit comments

Comments
 (0)