From 2b09befd82c5d251e65f41f90ebc54ea1d06837a Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Wed, 21 Jun 2017 10:16:19 -0700 Subject: [PATCH 1/6] Move to .NET Standard 1.0 and add .gitignore --- .gitignore | 295 ++++++++++++++++++ Microsoft.Linq.Translations.sln | 19 +- .../Microsoft.Linq.Translations.csproj | 8 + .../Microsoft.Linq.Translations.xproj | 18 -- .../Properties/AssemblyInfo.cs | 33 -- Microsoft.Linq.Translations/TranslationMap.cs | 2 +- Microsoft.Linq.Translations/project.json | 22 -- 7 files changed, 311 insertions(+), 86 deletions(-) create mode 100644 .gitignore create mode 100644 Microsoft.Linq.Translations/Microsoft.Linq.Translations.csproj delete mode 100644 Microsoft.Linq.Translations/Microsoft.Linq.Translations.xproj delete mode 100644 Microsoft.Linq.Translations/Properties/AssemblyInfo.cs delete mode 100644 Microsoft.Linq.Translations/project.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..22fd88a --- /dev/null +++ b/.gitignore @@ -0,0 +1,295 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ +**/Properties/launchSettings.json + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Typescript v1 declaration files +typings/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs diff --git a/Microsoft.Linq.Translations.sln b/Microsoft.Linq.Translations.sln index f2ddef6..586d13e 100644 --- a/Microsoft.Linq.Translations.sln +++ b/Microsoft.Linq.Translations.sln @@ -1,9 +1,7 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Linq.Translations", "Microsoft.Linq.Translations\Microsoft.Linq.Translations.xproj", "{BC3BD9FC-AEBF-4C19-8110-00FAB71BEBAF}" +# Visual Studio 2012 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Linq.Translations", "Microsoft.Linq.Translations\Microsoft.Linq.Translations.csproj", "{6B5B7F5B-A09B-41FE-AB96-DA34A06811D1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,12 +9,9 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BC3BD9FC-AEBF-4C19-8110-00FAB71BEBAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC3BD9FC-AEBF-4C19-8110-00FAB71BEBAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC3BD9FC-AEBF-4C19-8110-00FAB71BEBAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC3BD9FC-AEBF-4C19-8110-00FAB71BEBAF}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE + {6B5B7F5B-A09B-41FE-AB96-DA34A06811D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B5B7F5B-A09B-41FE-AB96-DA34A06811D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B5B7F5B-A09B-41FE-AB96-DA34A06811D1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B5B7F5B-A09B-41FE-AB96-DA34A06811D1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/Microsoft.Linq.Translations/Microsoft.Linq.Translations.csproj b/Microsoft.Linq.Translations/Microsoft.Linq.Translations.csproj new file mode 100644 index 0000000..616ed07 --- /dev/null +++ b/Microsoft.Linq.Translations/Microsoft.Linq.Translations.csproj @@ -0,0 +1,8 @@ + + + + netstandard1.0 + Microsoft.Linq.Translations + + + diff --git a/Microsoft.Linq.Translations/Microsoft.Linq.Translations.xproj b/Microsoft.Linq.Translations/Microsoft.Linq.Translations.xproj deleted file mode 100644 index 73f011a..0000000 --- a/Microsoft.Linq.Translations/Microsoft.Linq.Translations.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 03826597-65db-40ad-8569-85e6b787046b - Microsoft.Linq.Translations - ..\artifacts\obj\$(MSBuildProjectName) - ..\artifacts\bin\$(MSBuildProjectName)\ - - - 2.0 - - - \ No newline at end of file diff --git a/Microsoft.Linq.Translations/Properties/AssemblyInfo.cs b/Microsoft.Linq.Translations/Properties/AssemblyInfo.cs deleted file mode 100644 index 95233c0..0000000 --- a/Microsoft.Linq.Translations/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Microsoft.Linq.Translations")] -[assembly: AssemblyDescription("Provides a LINQ provider independent way of translating computed properties into complex expressions.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("David Fowler, Damien Guard")] -[assembly: AssemblyProduct("Microsoft.Linq.Translations")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2009")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.0")] diff --git a/Microsoft.Linq.Translations/TranslationMap.cs b/Microsoft.Linq.Translations/TranslationMap.cs index a69fd18..cd12345 100644 --- a/Microsoft.Linq.Translations/TranslationMap.cs +++ b/Microsoft.Linq.Translations/TranslationMap.cs @@ -18,7 +18,7 @@ public class TranslationMap : Dictionary { Argument.EnsureNotNull("method", method); - var propertyInfo = method.DeclaringType.GetProperty(method.Name.Replace("get_", String.Empty)); + var propertyInfo = method.DeclaringType.GetRuntimeProperty(method.Name.Replace("get_", String.Empty)); return this[propertyInfo] as CompiledExpression; } diff --git a/Microsoft.Linq.Translations/project.json b/Microsoft.Linq.Translations/project.json deleted file mode 100644 index ab871e6..0000000 --- a/Microsoft.Linq.Translations/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.1.0-*", - "description": "Microsoft.Linq.Translations", - "authors": [ "Damien Guard", "David Fowler", "Colin Meek" ], - "tags": [ "linq", "computedproperties"], - "projectUrl": "http://damieng.com/blog/2009/06/24/client-side-properties-and-any-remote-linq-provider", - "licenseUrl": "http://www.microsoft.com/opensource/licenses.mspx", - "requireLicenseAcceptance": true, - - "frameworks": { - "dotnet": { - "dependencies": { - "System.Runtime": "4.0.0-*", - "System.Collections": "4.0.0-*", - "System.Linq": "4.0.0-*", - "System.Linq.Expressions": "4.0.0-*", - "System.Reflection": "4.0.0-*", - "System.Reflection.TypeExtensions": "4.0.0-*" - } - } - } -} From f130d80a1406fbd05142d64286c4bda1db3ac452 Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Wed, 21 Jun 2017 10:46:36 -0700 Subject: [PATCH 2/6] Add travis build file --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..ff6d80f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: csharp +dist: trusty +sudo: required +mono: none +dotnet: 1.0.1 +script: + - ./build.sh --quiet verify From 1e5c2da59ea0c8726fe9f6f82f18a680dd4dae7a Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Wed, 21 Jun 2017 19:13:36 -0700 Subject: [PATCH 3/6] Add missing build.sh file for travis --- build.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 build.sh diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..b13e436 --- /dev/null +++ b/build.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +dotnet restore && dotnet build From fbce05af829adc1c8c6b2764adeadce435d850c3 Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Wed, 21 Jun 2017 19:26:31 -0700 Subject: [PATCH 4/6] Set build.sh to execute --- build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build.sh diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 From 7ab00978f5d6abaf8bb5815dc0d8b9beceeb584b Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Wed, 2 Aug 2017 23:30:39 -0700 Subject: [PATCH 5/6] Configure appveyor for VS2017 --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..9fd130c --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,2 @@ +version: 0.{build} +image: Visual Studio 2017 From 58f753ca896adf7117f3e43847aae144cef89b26 Mon Sep 17 00:00:00 2001 From: Damien Guard Date: Wed, 2 Aug 2017 23:44:26 -0700 Subject: [PATCH 6/6] Flesh out appveyor --- appveyor.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 9fd130c..72fd6dc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,2 +1,14 @@ version: 0.{build} image: Visual Studio 2017 + +before_build: + - cmd: dotnet --version + - cmd: dotnet restore ./Microsoft.Linq.Translations.sln --verbosity m + +build_script: + - cmd: dotnet publish ./Microsoft.Linq.Translations.sln + +artifacts: + - path: ./Microsoft.Linq.Translations/bin/Debug/netstandard1.0/publish + name: DotNetStandard1_0 + type: zip