Skip to content

Commit 43c89ae

Browse files
committed
Merge remote-tracking branch 'origin/master' into u/vgromfeld/bindableAttributeRemoved
2 parents 971640d + 068faf4 commit 43c89ae

File tree

6 files changed

+114
-22
lines changed

6 files changed

+114
-22
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
## Fixes #<!-- Link to relevant issue (for ex: #1234) which will automatically close the issue once the PR is merged -->
1+
## Fixes #<!-- Link to relevant issue (for ex: #1234) which will automatically close the issue once the PR is merged. -->
22

3-
<!-- Add a brief overview here of the feature/bug & fix -->
3+
<!-- Add a brief overview here of the feature/bug & fix. -->
44

55
## PR Type
66
What kind of change does this PR introduce?
7-
<!-- Please uncomment one ore more that apply to this PR -->
7+
<!-- Please uncomment one or more that apply to this PR. -->
88

99
<!-- - Bugfix -->
1010
<!-- - Feature -->
@@ -38,7 +38,7 @@ Please check if your PR fulfills the following requirements:
3838
- [ ] Contains **NO** breaking changes
3939

4040
<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below.
41-
Please note that breaking changes are likely to be rejected -->
41+
Please note that breaking changes are likely to be rejected. -->
4242

4343

4444
## Other information

CODE_OF_CONDUCT.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at conduct@dotnetfoundation.org. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

azure-pipelines.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,14 @@ steps:
5252
#- powershell: .\build\Install-WindowsSdkISO.ps1 17763
5353
# displayName: Insider SDK
5454

55-
- powershell: .\build\build.ps1 -target=Default
56-
displayName: Build
55+
- powershell: .\build\build.ps1 -target=Build
56+
displayName: Build
57+
58+
- powershell: .\build\build.ps1 -target=Test
59+
displayName: Test
60+
61+
- powershell: .\build\build.ps1 -target=Package
62+
displayName: Package
5763

5864
- task: PublishTestResults@2
5965
inputs:

build/build.cake

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,14 @@ void VerifyHeaders(bool Replace)
9494
}
9595
}
9696

97+
void RetrieveVersion()
98+
{
99+
Information("\nRetrieving version...");
100+
var results = StartPowershellFile(versionClient);
101+
Version = results[1].Properties["NuGetPackageVersion"].Value.ToString();
102+
Information("\nBuild Version: " + Version);
103+
}
104+
97105
//////////////////////////////////////////////////////////////////////
98106
// DEFAULT TASK
99107
//////////////////////////////////////////////////////////////////////
@@ -137,14 +145,11 @@ Task("Version")
137145

138146
NuGetInstall(new []{"nerdbank.gitversioning"}, installSettings);
139147

140-
Information("\nRetrieving version...");
141-
var results = StartPowershellFile(versionClient);
142-
Version = results[1].Properties["NuGetPackageVersion"].Value.ToString();
143-
Information("\nBuild Version: " + Version);
148+
RetrieveVersion();
144149
});
145150

146-
Task("Build")
147-
.Description("Build all projects and get the assemblies")
151+
Task("BuildProjects")
152+
.Description("Build all projects")
148153
.IsDependentOn("Version")
149154
.Does(() =>
150155
{
@@ -173,9 +178,9 @@ Task("Build")
173178
});
174179

175180
Task("InheritDoc")
176-
.Description("Updates <inheritdoc /> tags from base classes, interfaces, and similar methods")
177-
.IsDependentOn("Build")
178-
.Does(() =>
181+
.Description("Updates <inheritdoc /> tags from base classes, interfaces, and similar methods")
182+
.IsDependentOn("BuildProjects")
183+
.Does(() =>
179184
{
180185
Information("\nDownloading InheritDoc...");
181186
var installSettings = new NuGetInstallSettings {
@@ -201,9 +206,13 @@ Task("InheritDoc")
201206
Information("\nFinished generating documentation with InheritDoc");
202207
});
203208

209+
Task("Build")
210+
.Description("Build all projects runs InheritDoc")
211+
.IsDependentOn("BuildProjects")
212+
.IsDependentOn("InheritDoc");
213+
204214
Task("Package")
205215
.Description("Pack the NuPkg")
206-
.IsDependentOn("InheritDoc")
207216
.Does(() =>
208217
{
209218
// Invoke the pack target in the end
@@ -236,12 +245,14 @@ Task("Package")
236245
buildSettings.SetPlatformTarget(PlatformTarget.x86);
237246
MSBuild(Solution, buildSettings);
238247

248+
RetrieveVersion();
249+
239250
var nuGetPackSettings = new NuGetPackSettings
240251
{
241252
OutputDirectory = nupkgDir,
242253
Version = Version
243254
};
244-
255+
245256
var nuspecs = GetFiles("./*.nuspec");
246257
foreach (var nuspec in nuspecs)
247258
{
@@ -264,7 +275,6 @@ public string getMSTestAdapterPath(){
264275

265276
Task("Test")
266277
.Description("Runs all Tests")
267-
.IsDependentOn("Build")
268278
.Does(() =>
269279
{
270280
var vswhere = VSWhereLatest(new VSWhereLatestSettings
@@ -300,7 +310,8 @@ Task("Test")
300310
//////////////////////////////////////////////////////////////////////
301311

302312
Task("Default")
303-
.IsDependentOn("Test")
313+
.IsDependentOn("Build")
314+
.IsDependentOn("Test")
304315
.IsDependentOn("Package");
305316

306317
Task("UpdateHeaders")

contributing.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,11 @@ For every contribution, you must:
3636
* target master branch (or an appropriate release branch if appropriate for a bug fix)
3737

3838
* If adding a new feature
39-
* Before starting coding, **you should open an uservoice entry** under "Windows Community Toolkit" on [Uservoice](https://wpdev.uservoice.com/forums/110705-universal-windows-platform/category/193402-uwp-community-toolkit) and start discussing with the community to see if your idea/feature is interesting enough.
39+
* Before starting coding, **you should open an [issue](https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/new?assignees=&labels=feature+request+%3Amailbox_with_mail%3A&template=feature_request.md&title=%5BFeature%5D)** and start discussing with the community to see if your idea/feature is interesting enough.
4040
* Add or update a sample for the [Sample app](https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.SampleApp)
4141
* If creating a new sample, create a new icon by following the [Thumbnail Style Guide and templates](https://github.com/Microsoft/UWPCommunityToolkit-design-assets)
4242
* Add or update unit tests (if applicable)
4343

44-
4544
PR has to be validated by at least two core members before being merged.
4645

4746
Once merged, you can get a pre-release package of the toolkit by adding this ([Nuget repo](https://dotnet.myget.org/F/uwpcommunitytoolkit/api/v3/index.json) | [Gallery](https://dotnet.myget.org/gallery/uwpcommunitytoolkit)) to your Visual Studio.

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Do you want to contribute? Here are our [contribution guidelines](https://github
188188

189189
This project has adopted the code of conduct defined by the [Contributor Covenant](http://contributor-covenant.org/)
190190
to clarify expected behavior in our community.
191-
For more information see the [.NET Foundation Code of Conduct](http://dotnetfoundation.org/code-of-conduct).
191+
For more information see the [.NET Foundation Code of Conduct](CODE_OF_CONDUCT.md).
192192

193193
## Roadmap
194194
Read what we [plan for next iterations](https://github.com/windows-toolkit/WindowsCommunityToolkit/milestones), and feel free to ask questions.

0 commit comments

Comments
 (0)