From f9376ed83fcade19fa891d6524d7a0f938ffce04 Mon Sep 17 00:00:00 2001 From: Nick Maliwacki Date: Thu, 6 Sep 2018 17:02:31 -0700 Subject: [PATCH 1/2] put license in files that will be copied into other repros --- managed-native-desktop/Dockerfile | 5 ++++- managed-native-desktop/Install.cmd | 5 ++++- native-desktop/Dockerfile | 5 ++++- native-desktop/Install.cmd | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/managed-native-desktop/Dockerfile b/managed-native-desktop/Dockerfile index 672454f..2262168 100644 --- a/managed-native-desktop/Dockerfile +++ b/managed-native-desktop/Dockerfile @@ -1,7 +1,10 @@ # escape=` +# The MIT License (MIT) # Copyright (C) Microsoft Corporation. All rights reserved. -# Licensed under the MIT license. See LICENSE.txt in the project root for license information. +# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ARG FROM_IMAGE=microsoft/dotnet-framework:3.5-sdk-windowsservercore-1709 FROM ${FROM_IMAGE} diff --git a/managed-native-desktop/Install.cmd b/managed-native-desktop/Install.cmd index a0c07c7..ee53746 100644 --- a/managed-native-desktop/Install.cmd +++ b/managed-native-desktop/Install.cmd @@ -1,5 +1,8 @@ +@rem The MIT License (MIT) @rem Copyright (C) Microsoft Corporation. All rights reserved. -@rem Licensed under the MIT license. See LICENSE.txt in the project root for license information. +@rem Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +@rem The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +@rem THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @if not defined _echo echo off setlocal enabledelayedexpansion diff --git a/native-desktop/Dockerfile b/native-desktop/Dockerfile index ffaab3d..ed1fc17 100644 --- a/native-desktop/Dockerfile +++ b/native-desktop/Dockerfile @@ -1,7 +1,10 @@ # escape=` +# The MIT License (MIT) # Copyright (C) Microsoft Corporation. All rights reserved. -# Licensed under the MIT license. See LICENSE.txt in the project root for license information. +# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ARG FROM_IMAGE=microsoft/dotnet-framework:3.5-sdk-windowsservercore-1709 FROM ${FROM_IMAGE} diff --git a/native-desktop/Install.cmd b/native-desktop/Install.cmd index a0c07c7..ee53746 100644 --- a/native-desktop/Install.cmd +++ b/native-desktop/Install.cmd @@ -1,5 +1,8 @@ +@rem The MIT License (MIT) @rem Copyright (C) Microsoft Corporation. All rights reserved. -@rem Licensed under the MIT license. See LICENSE.txt in the project root for license information. +@rem Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +@rem The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +@rem THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @if not defined _echo echo off setlocal enabledelayedexpansion From 64679f767d9ac394ddcedbcfc4ab5f05be4c9527 Mon Sep 17 00:00:00 2001 From: Nick Maliwacki Date: Thu, 6 Sep 2018 23:37:29 -0700 Subject: [PATCH 2/2] update contribution guidelines and add license to readme (#1) --- CONTRIBUTING.md | 2 +- managed-native-desktop/README.md | 7 +++++++ native-desktop/README.md | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4c957e7..57f3897 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ We would love practical, unique, and inspiring samples to help developers tailor ## Rules 1. All contributions must install Visual Studio Build Tools. 2. All contributions must be text (dockerfiles, scripts, etc.). -3. All contributions must adopt the [MIT license](LICENSE.txt) in the root of this project with accompanied header (see [example](managed-native-desktop/Dockerfile)). +3. All contributions must adopt the [MIT license](LICENSE.txt) at the top of each file (see [example](managed-native-desktop/Dockerfile)). 4. All contributions must be in a unique directory. 5. All contributions must have a README file explaining in generalized terms (i.e. no company secrets, but providing context on who you are or represents is optional and might be useful) what sort of workloads the Dockerfile supports (see [example](managed-native-desktop/README.md)). 6. All supporting files referenced within the Dockerfile must be text and included within the samples directory (see [example](managed-native-desktop/Install.cmd)). diff --git a/managed-native-desktop/README.md b/managed-native-desktop/README.md index 17f102f..774231d 100644 --- a/managed-native-desktop/README.md +++ b/managed-native-desktop/README.md @@ -1,3 +1,10 @@ + # .NET Framework + native desktop The Visual Studio setup engine builds both managed and native projects. Some managed projects even target .NET Framework 3.5 to provide a better downlevel experience where 4.5 is not (yet) present. Because of that, we start from the microsoft/dotnet-framework:3.5-sdk-windowsservercore-1709 base image. We use RS3 because the same image can be used on Windows Server 2016 nodes that do not yet support RS4 containers. diff --git a/native-desktop/README.md b/native-desktop/README.md index 48707e2..b66697c 100644 --- a/native-desktop/README.md +++ b/native-desktop/README.md @@ -1,3 +1,10 @@ + # Native desktop This sample produces an image that installs native C/C++ support only. It installs the core VC Tools workload with recommended components that include CMake and the Windows SDK. See our documentation for [additional workloads and components](http://aka.ms/vs/workloads) you can use.