Skip to content

Commit

Permalink
Update to RT 1.0.0-beta2-62922-02
Browse files Browse the repository at this point in the history
  • Loading branch information
tmat committed May 22, 2018
1 parent 20b9252 commit cb0b761
Show file tree
Hide file tree
Showing 51 changed files with 790 additions and 571 deletions.
92 changes: 39 additions & 53 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,63 +1,49 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
# Set default behavior to:
# automatically normalize line endings on check-in, and
# convert to Windows-style line endings on check-out
###############################################################################
* text=auto
* text=auto encoding=UTF-8
*.sh text eol=lf

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
# Set file behavior to:
# treat as text, and
# diff as C# source code
###############################################################################
#*.cs diff=csharp
*.cs text diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary
# Set file behavior to:
# treat as text
###############################################################################
*.cmd text
*.config text
*.csproj text
*.groovy text
*.json text
*.md text
*.nuspec text
*.pkgdef text
*.proj text
*.projitems text
*.props text
*.ps1 text
*.resx text
*.ruleset text
*.shproj text
*.sln text
*.targets text
*.vb text
*.vbproj text
*.vcxproj text
*.vcxproj.filters text
*.vsct text
*.vsixmanifest text

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
# Set file behavior to:
# treat as binary
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
*.png binary
*.snk binary
87 changes: 8 additions & 79 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,105 +4,34 @@
# User-specific files
*.suo
*.user
*.sln.docstates
.vs/
*.VC.db
.vscode/

# Build results
[Aa]rtifacts/
[Dd]ebug/
[Rr]elease/
x64/
[Bb]in/
[Oo]bj/
artifacts/
Debug/
Release/
bin/
obj/
.dotnet/
.tools/
.packages/

# Per-user project properties
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.wrn
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile
*.VC.opendb
launchSettings.json

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.pfx
*.publishsettings

# SQL Server files
App_Data/*.mdf
App_Data/*.ldf

# =========================
# Windows detritus
# =========================

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac desktop service store files
.DS_Store
2 changes: 1 addition & 1 deletion .vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ steps:
signType: real
esrpSigning: true

- script: build\CIBuild.cmd -configuration $(BuildConfiguration)
- script: eng\common\CIBuild.cmd -configuration $(BuildConfiguration)
displayName: Build

- task: PublishTestResults@1
Expand Down
2 changes: 1 addition & 1 deletion Build.cmd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile %~dp0build\Build.ps1 -restore -build -deploy %*
powershell -ExecutionPolicy ByPass -command "& """%~dp0eng\common\Build.ps1""" -restore -build %*"
exit /b %ErrorLevel%
38 changes: 1 addition & 37 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,43 +1,7 @@
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>

<Import Project="build\NuGet.props"/>
<Import Project="build\Versions.props"/>
<Import Project="build\RepoToolset\RestoreSources.props"/>

<ItemGroup>
<PackageReference Include="RoslynTools.RepoToolset" Version="$(RoslynToolsRepoToolsetVersion)" />
</ItemGroup>

<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>

<RestoreSources>$(RestoreSources);https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json</RestoreSources>

<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>

<!--
RepoToolset props and targets are conditionally imported based on whether RepoToolsetDir is set or not
to allow VS to load packages and perform automatic package restore.
TODO: Remove once we can use a custom SDK (https://github.com/Microsoft/msbuild/issues/1493)
-->
<_RepoToolsetDir>$(NuGetPackageRoot)roslyntools.repotoolset\$(RoslynToolsRepoToolsetVersion)\tools\</_RepoToolsetDir>
<RepoToolsetDir Condition="'$(BuildingInsideVisualStudio)' != 'true' or Exists('$(_RepoToolsetDir)')">$(_RepoToolsetDir)</RepoToolsetDir>

<AssetsDir>$(RepoRoot)assets\</AssetsDir>

<RepositoryUrl>https://github.com/dotnet/roslyn-analyzers</RepositoryUrl>
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>

<AssetsDir>$(MSBuildThisFileDirectory)assets\</AssetsDir>
<VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix>
</PropertyGroup>

<!--
TODO: Import layout props so that design-time build executed before package restore is finished doesn't
product artifacts into wrong obj directories. Remove once we can use a custom SDK (https://github.com/Microsoft/msbuild/issues/1493)
-->
<Import Project="build\RepoToolset\ProjectLayout.props"/>
</Project>
2 changes: 1 addition & 1 deletion Restore.cmd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile %~dp0build\Build.ps1 -restore %*
powershell -ExecutionPolicy ByPass -command "& """%~dp0eng\common\Build.ps1""" -restore %*"
exit /b %ErrorLevel%
2 changes: 1 addition & 1 deletion Test.cmd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile %~dp0build\Build.ps1 -test %*
powershell -ExecutionPolicy ByPass -command "& """%~dp0eng\common\Build.ps1""" -test %*"
exit /b %ErrorLevel%
3 changes: 0 additions & 3 deletions build/CIBuild.cmd

This file was deleted.

14 changes: 0 additions & 14 deletions build/NuGet.props

This file was deleted.

22 changes: 0 additions & 22 deletions build/RepoToolset/ProjectLayout.props

This file was deleted.

37 changes: 0 additions & 37 deletions build/RepoToolset/RepoLayout.props

This file was deleted.

16 changes: 0 additions & 16 deletions build/RepoToolset/RestoreSources.props

This file was deleted.

Loading

0 comments on commit cb0b761

Please sign in to comment.