Skip to content

Preview 5 Branch Snap #617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 166 commits into from
Apr 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
166 commits
Select commit Hold shift + click to select a range
0a8a63d
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 8, 2019
6d8189a
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 8, 2019
fea93ce
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 9, 2019
66efaf1
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 9, 2019
8430bf6
Update dependencies from dotnet/corefx (#337)
dotnet-maestro[bot] Feb 11, 2019
43f5f44
Updating branding to Preview4 (#338)
vatsan-madhavan Feb 11, 2019
e7bc5d6
adding back platform builds
stevenbrix Feb 11, 2019
4d9aad4
passing platform to cibuild.cmd
stevenbrix Feb 11, 2019
bc8ddb2
adding _PlatformArgs to the right place
stevenbrix Feb 11, 2019
5bb53eb
Merge pull request #341 from dotnet/dev/stevenbrix/addBackPlatformBuilds
stevenbrix Feb 11, 2019
b71f909
Go back to producing packages sans preview label (#345)
vatsan-madhavan Feb 11, 2019
d8e8d47
Add release/3.0 to list of triggers (#344)
vatsan-madhavan Feb 11, 2019
479b0c6
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 12, 2019
485b5cf
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 13, 2019
0269819
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 13, 2019
a0582de
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 14, 2019
1c86e7b
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 14, 2019
73e4393
Update .NET Core SDK link. (#353)
KexyBiscuit Feb 15, 2019
b25dc75
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 15, 2019
9cd4b3a
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 15, 2019
390733f
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 16, 2019
6c42ff0
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 16, 2019
17abcea
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 17, 2019
6c13b91
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 18, 2019
d6d2689
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 19, 2019
4dadccd
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 20, 2019
aad81a2
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 20, 2019
2ea36c2
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 21, 2019
2bdf597
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 21, 2019
c5b7891
Set copyright and package license (#373)
tmat Feb 21, 2019
e42494e
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 22, 2019
585edbc
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 22, 2019
e39ffd9
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 23, 2019
3102885
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 24, 2019
9398f6d
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 25, 2019
c12079a
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 26, 2019
601e792
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 26, 2019
b9e7806
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 27, 2019
7654d24
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 27, 2019
f298d00
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Feb 28, 2019
3dd8a5e
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Feb 28, 2019
fe47f14
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 1, 2019
fdfb042
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Mar 1, 2019
03a1459
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 2, 2019
4f98aa3
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Mar 2, 2019
80ba855
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Mar 3, 2019
a9cbb33
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Mar 4, 2019
c252406
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 5, 2019
352fd8d
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Mar 5, 2019
869e3e8
LOC CHECKIN | dotnet/wpf master | 20190131 (#309)
v-zbsail Mar 5, 2019
0bc7210
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 6, 2019
5366805
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Mar 6, 2019
99b54f6
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 7, 2019
132d0b6
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Mar 7, 2019
c3dde26
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 8, 2019
aa8809d
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Mar 8, 2019
c7e7b93
Move untranslated strings out of shared resx file and update xlfs (#423)
ryalanms Mar 8, 2019
3d5e5f5
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 9, 2019
9bcbe6d
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Mar 9, 2019
15f04af
Update VS2019 link in README.md
Garfield550 Mar 9, 2019
5cd0a56
Update VS2019 Preview link in README.md
Garfield550 Mar 9, 2019
ba64d97
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 10, 2019
26c0587
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Mar 10, 2019
29407b1
[master] Update dependencies from dotnet/arcade (#433)
dotnet-maestro[bot] Mar 12, 2019
4eace56
[master] Update dependencies from dotnet/corefx (#432)
dotnet-maestro[bot] Mar 14, 2019
234c683
Update dependencies from https://github.com/dotnet/corefx build 20190…
dotnet-maestro[bot] Mar 16, 2019
b971190
[master] Update dependencies from dotnet/arcade (#441)
dotnet-maestro[bot] Mar 19, 2019
3cd9a82
fix publishing
stevenbrix Mar 20, 2019
8a8aad5
Merge pull request #453 from dotnet/dev/stevenbrix/fixPublishing
stevenbrix Mar 20, 2019
2807d42
Fix documentation type and punctuation
skendrot Mar 21, 2019
0a1f96b
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 21, 2019
dd0144a
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 22, 2019
395f798
Add coherent parent attributes (#457)
mmitche Mar 22, 2019
01f706b
Merge pull request #454 from skendrot/patch-1
stevenbrix Mar 22, 2019
0080981
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 23, 2019
5c0ae89
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Mar 25, 2019
9b43742
Merge pull request #428 from Garfield550/patch-1
stevenbrix Mar 25, 2019
cc04110
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 26, 2019
6fd73da
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 26, 2019
a9b7726
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Mar 26, 2019
6287314
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 27, 2019
75b0ea2
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Mar 27, 2019
fd721b5
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 28, 2019
8eab750
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Mar 28, 2019
031b79d
Onboarding new build infrastructure (#473)
vatsan-madhavan Mar 28, 2019
bd08ea5
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 29, 2019
e7e4052
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Mar 29, 2019
8592768
Fixes to get solution build within VS working again (#477)
vatsan-madhavan Mar 29, 2019
61d1355
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Mar 30, 2019
bd45bf3
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Mar 30, 2019
e7c2ee2
Update msvcurt-c1xx to 0.0.0.4 (#482)
vatsan-madhavan Apr 1, 2019
e2c0a68
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 2, 2019
2adcc1a
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 2, 2019
a66629a
LOC CHECKIN: Update localization files to align with .NET Framework (…
ryalanms Apr 2, 2019
0e817a1
Fallbacks for building internal WPF projects that use PresentationBui…
vatsan-madhavan Apr 2, 2019
3d1cf01
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 3, 2019
652f10b
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 3, 2019
0048537
Default NetCore references for internal markup compilation should inc…
ryalanms Apr 3, 2019
2b56364
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 3, 2019
a48d98b
Project template for WPF (#489)
vatsan-madhavan Apr 4, 2019
be7ba1f
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 4, 2019
7f2fe52
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 4, 2019
7f0fcca
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 5, 2019
85a0f24
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 5, 2019
14ce917
Make C# Project template identical to .NET Framework's template (#497)
vatsan-madhavan Apr 5, 2019
e25cd6b
[netcore3] Open source PresentationBuildTasks (#504)
ryalanms Apr 5, 2019
e761cd9
moving analyzers to targets files
stevenbrix Apr 5, 2019
c59b451
Merged PR 596: Add analyzers for System.Xaml
Mar 12, 2019
7ccbd2a
updating fxcopanalyzer package to include code fixers
stevenbrix Apr 5, 2019
08aff8c
fixing violations for CA1507
stevenbrix Apr 5, 2019
f43e533
fixing/suppressing PBT and some System.Xaml issues
stevenbrix Apr 6, 2019
f0b42a9
Fix coherency attributes (#507)
mmitche Apr 6, 2019
396b777
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 6, 2019
8e9932e
updating suppressions to properly follow how errors should be suppressed
stevenbrix Apr 6, 2019
22e947f
Merge pull request #509 from dotnet/dev/stevenbrix/enableAnalyzersAnd…
stevenbrix Apr 6, 2019
efc7d0b
reverting completing of PR (#516)
stevenbrix Apr 6, 2019
a1132a2
Public key tokens of .NET core WPF assemblies and .NET Framework WPF …
ryalanms Apr 6, 2019
f570a4e
[master] Update dependencies from dotnet/arcade (#512)
dotnet-maestro[bot] Apr 7, 2019
9a043ba
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 7, 2019
2495898
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 8, 2019
7e7a638
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 8, 2019
fc1f9df
Dev/stevenki/port analyzers and system xaml (#517)
stevenbrix Apr 8, 2019
acdb93b
Change label for master to preview 5 (#537)
vatsan-madhavan Apr 9, 2019
9a5de09
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 9, 2019
37bdb2d
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 9, 2019
ae0597e
Update dependencies from https://github.com/dotnet/winforms build 201…
dotnet-maestro[bot] Apr 9, 2019
5fbd455
Use RuntimeFrameworkVersion in builds (#534)
vatsan-madhavan Apr 9, 2019
f4e04b7
Fix line endings in license headers (related to #542)
ryalanms Apr 9, 2019
8040782
LOC CHECKIN | dotnet/wpf master | 20190405 (#501)
v-zbsail Apr 9, 2019
3046789
Make build.sh executable (#519)
hughbe Apr 9, 2019
47e5449
Onboard on async publishing
JohnTortugo Apr 10, 2019
1132ec7
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 10, 2019
d7668ae
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 10, 2019
f109e39
Some changes to Versions.props and Versions.Details.xml to make them …
zsd4yr Apr 10, 2019
fbcf87d
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 11, 2019
826a40f
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 11, 2019
3f052be
Recognize Application.xaml as well as App.xaml (#545)
wjk Apr 11, 2019
38b3efb
LOC CHECKIN | Add PresentationBuildTasks xlf localization (#544)
ryalanms Apr 11, 2019
0d91edd
Merge pull request #555 from JohnTortugo/PublishUsingPipelines
JohnTortugo Apr 11, 2019
b5c844a
BamlMapTable should always reinitialize KnownAssemblyInfoRecord
ryalanms Apr 12, 2019
7b29049
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 12, 2019
ca6bb59
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 12, 2019
e48ffe0
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 13, 2019
6923e62
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 13, 2019
a453170
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 14, 2019
c7870e4
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 14, 2019
8916d17
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 15, 2019
86d0a97
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 15, 2019
98d8e57
LOC CHECKIN | dotnet/wpf master | 20190415 (#582)
v-zbsail Apr 15, 2019
ec1e576
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 16, 2019
7fa3965
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 16, 2019
b85bdfa
Make BamlMapTable's KnownAssemblyInfoRecord an instance field (#589)
ryalanms Apr 16, 2019
caf82fd
Ensure that newer files are always updated under artifacts\packaging …
vatsan-madhavan Apr 16, 2019
e94fdb1
Add AssemblyMetadata[Language] attribute (#596)
vatsan-madhavan Apr 16, 2019
ff08359
Update targets to adapt to ref-pack based references (#588)
vatsan-madhavan Apr 16, 2019
12a02e7
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 17, 2019
8beb1b2
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 17, 2019
ae93d29
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 18, 2019
c982b9e
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 18, 2019
71d36ba
Set TargetingPackVersion intentionally (#604)
vatsan-madhavan Apr 18, 2019
9d07a1f
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 19, 2019
b409881
Update dependencies from https://github.com/dotnet/arcade build 20190…
dotnet-maestro[bot] Apr 20, 2019
b25e77a
[master] Update dependencies from dotnet/core-setup (#609)
dotnet-maestro[bot] Apr 20, 2019
8a32ffc
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 21, 2019
564aebd
Update dependencies from https://github.com/dotnet/core-setup build 2…
dotnet-maestro[bot] Apr 22, 2019
7209dac
Merge with master and resolve all conflicts in favor of master.
vatsan-madhavan Apr 22, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Microsoft.Dotnet.Wpf.sln
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28407.52
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ variables:
# When set to true in a manual built, it produces and publishes
# Microsoft.DotNet.Arcade.Wpf.Sdk
BuildMsBuildSdkPackages: false
_PublishUsingPipelines: false
_DotNetArtifactsCategory: .NETCore
_PublishUsingPipelines: true
_DotNetArtifactsCategory: WINDOWSDESKTOP

# only trigger ci builds for the master and release branches
trigger:
Expand Down
88 changes: 44 additions & 44 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,79 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview4.19212.13" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dc522ef97fac72e64cd74825b7ef497f82af4624</Sha>
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview5.19218.1">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>f977a22b418447e1a42d04a61ab29c289465146f</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview4.19212.13" CoherentParentDependency="Microsoft.NETCore.App">
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dc522ef97fac72e64cd74825b7ef497f82af4624</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview4.19212.13" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.CodeDom" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dc522ef97fac72e64cd74825b7ef497f82af4624</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview4.19212.13" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dc522ef97fac72e64cd74825b7ef497f82af4624</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview4.19212.13" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dc522ef97fac72e64cd74825b7ef497f82af4624</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview4.19212.13" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dc522ef97fac72e64cd74825b7ef497f82af4624</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview4.19212.13" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dc522ef97fac72e64cd74825b7ef497f82af4624</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview4.19212.13" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dc522ef97fac72e64cd74825b7ef497f82af4624</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview4.19212.13" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dc522ef97fac72e64cd74825b7ef497f82af4624</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="4.6.0-preview4.19212.13" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dc522ef97fac72e64cd74825b7ef497f82af4624</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview4-27619-13" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>eff94d0f17352fb44287f39acbe06729cb896333</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview4.19212.13" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dc522ef97fac72e64cd74825b7ef497f82af4624</Sha>
<SourceBuildId>5589</SourceBuildId>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview4.19222.1">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>e88abb4ba892ae2a0b8ba053d38d4f3aff352626</Sha>
<SourceBuildId>6173</SourceBuildId>
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview4.19212.13" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dc522ef97fac72e64cd74825b7ef497f82af4624</Sha>
<SourceBuildId>5589</SourceBuildId>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview4.19212.13" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dc522ef97fac72e64cd74825b7ef497f82af4624</Sha>
<SourceBuildId>5589</SourceBuildId>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19209.2">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27621-08">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>416ae9f2f223d349130198b96d7ce9c617fa25cd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19218.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>63b76f3f952f821d0a7996427a9f3534f1c25ab7</Sha>
<Sha>5e7ce5b394f3477bb0a485a4b761b7742e95be37</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19209.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19218.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>63b76f3f952f821d0a7996427a9f3534f1c25ab7</Sha>
<Sha>5e7ce5b394f3477bb0a485a4b761b7742e95be37</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
57 changes: 38 additions & 19 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VersionPrefix>4.8.0</VersionPrefix>
<PreReleaseVersionLabel>preview4</PreReleaseVersionLabel>
<PreReleaseVersionLabel>preview5</PreReleaseVersionLabel>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview4.19212.13</SystemReflectionMetadataLoadContextVersion>
<MicrosoftPrivateWinformsVersion>4.8.0-preview4.19222.1</MicrosoftPrivateWinformsVersion>
Expand All @@ -11,31 +11,50 @@
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx -->
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview4.19212.13</MicrosoftWin32RegistryPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview4.19212.13</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview4.19212.13</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>4.6.0-preview4.19212.13</SystemReflectionEmitPackageVersion>
<MicrosoftPrivateWinformsVersion>4.8.0-preview5.19218.1</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<MicrosoftNETCoreAppVersion>3.0.0-preview5-27621-08</MicrosoftNETCoreAppVersion>
<MicrosoftNETCorePlatformsVersion>3.0.0-preview5.19221.5</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>4.6.0-preview5.19221.5</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>4.6.0-preview5.19221.5</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview5.19221.5</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview5.19221.5</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview5.19221.5</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview5.19221.5</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview5.19221.5</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>4.6.0-preview5.19221.5</SystemReflectionEmitPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>4.6.0-preview4.19212.13</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview4.19212.13</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview4.19212.13</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview4.19212.13</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview4.19212.13</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview4.19212.13</SystemCodeDomPackageVersion>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19209.2</MicrosoftDotNetCodeAnalysisPackageVersion>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<SystemSecurityAccessControlPackageVersion>4.6.0-preview5.19221.5</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview5.19221.5</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview5.19221.5</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview5.19221.5</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview5.19221.5</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19218.7</MicrosoftDotNetCodeAnalysisPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup>
<SystemReflectionTypeLoaderPackageVersion>0.1.0-preview2-181205-2</SystemReflectionTypeLoaderPackageVersion>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
</PropertyGroup>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
<PropertyGroup>
<SystemCodeDomPackageVersionForPresentationBuildTasks>4.4.0</SystemCodeDomPackageVersionForPresentationBuildTasks>
<!-- Other Packages that require manual updating-->
</PropertyGroup>
<!-- Other Packages that require manual updating-->
<PropertyGroup>
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
<StrawberryPerlVersion>5.28.1.1-1</StrawberryPerlVersion>
<XUnitRunnerConsoleVersion>2.4.0</XUnitRunnerConsoleVersion>
<XUnitRunnerVisualStudioVersion>2.4.0</XUnitRunnerVisualStudioVersion>
<XUnitVersion>2.4.0</XUnitVersion>
<XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
<XUnitRunnerVisualStudioVersion>$(XUnitVersion)</XUnitRunnerVisualStudioVersion>
</PropertyGroup>
<PropertyGroup>
<RestoreSources>
Expand Down
2 changes: 1 addition & 1 deletion eng/WpfArcadeSdk/Sdk/Sdk.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<IncludeDllSafeSearchPathAttribute Condition="'$(IncludeDllSafeSearchPathAttribute )'==''">true</IncludeDllSafeSearchPathAttribute>
</PropertyGroup>

<Import Project="$(WpfArcadeSdkToolsDir)RuntimeFrameworkReference.props"/>
<Import Project="$(WpfArcadeSdkToolsDir)SystemResources.props"/>
<Import Project="$(WpfArcadeSdkToolsDir)TargetFrameworks.props" />
<Import Project="$(WpfArcadeSdkToolsDir)VersionSuffix.props" />
Expand All @@ -31,7 +32,6 @@
<Import Project="$(WpfArcadeSdkToolsDir)ExtendedAssemblyInfo.props" />
<Import Project="$(WpfArcadeSdkToolsDir)Packaging.props" />
<Import Project="$(WpfArcadeSdkToolsDir)ProjectReferences.props" />
<Import Project="$(WpfArcadeSdkToolsDir)CodeAnalysis.props" />
<Import Project="$(WpfArcadeSdkToolsDir)Redist.props" />
<Import Project="$(WpfArcadeSdkToolsDir)Pbt.props" />
<Import Project="$(WpfArcadeSdkToolsDir)Signing.props" />
Expand Down
2 changes: 2 additions & 0 deletions eng/WpfArcadeSdk/Sdk/Sdk.targets
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<Import Project="$(WpfArcadeSdkToolsDir)Signing.targets" />

<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<Import Project="$(WpfArcadeSdkToolsDir)RuntimeFrameworkReference.targets"/>
<Import Project="$(WpfArcadeSdkToolsDir)InlineTasks.targets" />
<Import Project="$(WpfArcadeSdkToolsDir)ShippingProjects.targets" />
<Import Project="$(WpfArcadeSdkToolsDir)GenerateProgramFileForTests.targets" />
Expand All @@ -16,6 +17,7 @@
<Import Project="$(WpfArcadeSdkToolsDir)ExtendedAssemblyInfo.targets" />
<Import Project="$(WpfArcadeSdkToolsDir)Redist.targets" />
<Import Project="$(WpfArcadeSdkToolsDir)WpfProjectReference.targets" />
<Import Project="$(WpfArcadeSdkToolsDir)CodeAnalysis.targets" />
<Import Project="$(WpfArcadeSdkToolsDir)Wpf.Cpp.targets" Condition="'$(MSBuildProjectExtension)'=='.vcxproj'"/>
<Import Project="$(NoTargetsTargets)" Condition="'$(NoTargets)'=='true'"/>

Expand Down
14 changes: 14 additions & 0 deletions eng/WpfArcadeSdk/tools/CodeAnalysis.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project>
<PropertyGroup>
<CodeAnalysisRuleSet Condition="'$(IsTestProject)'!='true' AND '$(EnableAnalyzers)'=='true'">$(MSBuildThisFileDirectory)CodeAnalysis\WpfCodeAnalysis.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<ItemGroup Condition="'$(IsTestProject)'!='true' AND '$(EnableAnalyzers)'=='true'">
<!-- Managed Code Reference analyzers -->
<PackageReference Include="Microsoft.DotNet.CodeAnalysis" Version="$(MicrosoftDotNetCodeAnalysisPackageVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="2.9.0" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.3" />
<PackageReference Include="System.Runtime.Analyzers" Version="1.1.0" />
<PackageReference Include="System.Runtime.InteropServices.Analyzers" Version="1.1.0" />
</ItemGroup>
</Project>
20 changes: 20 additions & 0 deletions eng/WpfArcadeSdk/tools/ExtendedAssemblyInfo.targets
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,26 @@
<AssemblyMetadata Include="Commit" Condition="'$(SourceRevisionId)'!=''">
<Value>$(SourceRevisionId)</Value>
</AssemblyMetadata>

<!--
Crossgen wants to detect when an assembly is built from C++/CLI sources,
since it is unable to function correctly today (ostensibly due to bugs). Since
/clr:pure is deprecated and WPF will eventually switch over to /clr (i.e., IJW),
Crossgen will eventually (i.e., in the near-term) fail to work on C++/CLI
assemblies anyway.

Crossgen will detect [assembly: AssemblyMetadta("Language", "C++")] and
skip those assemblies. WPF will add this attribute to assemblies that are
compiled from C++/CLI sources.

WPF will also add [assembly: AssemblyMetadata("Language, "C#")] to C#
assemblies.

https://github.com/dotnet/wpf/issues/587
-->
<AssemblyMetadata Include="Language" Condition="'$(Language)'!=''">
<Value>$(Language)</Value>
</AssemblyMetadata>
</ItemGroup>
</Target>

Expand Down
Loading