CI Fixes

CluedIn-io · Oct 7, 2019 · a347997 · a347997
1 parent bc97f8a
commit a347997
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 86 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 ## 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
@@ -22,10 +24,13 @@ bld/
 [Oo]bj/
 [Ll]og/
 
-# Visual Studio 2015 cache/options directory
+# Visual Studio 2015/2017 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
-wwwroot/
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
@@ -40,19 +45,29 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
-# DNX
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
 project.lock.json
 project.fragment.lock.json
 artifacts/
+**/Properties/launchSettings.json
 
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
 *_i.c
 *_p.c
 *_i.h
 *.ilk
 *.meta
 *.obj
+*.iobj
 *.pch
 *.pdb
+*.ipdb
 *.pgc
 *.pgd
 *.rsp
@@ -90,6 +105,9 @@ ipch/
 *.vspx
 *.sap
 
+# Visual Studio Trace Files
+*.e2e
+
 # TFS 2012 Local Workspace
 $tf/
 
@@ -110,6 +128,14 @@ _TeamCity*
 # DotCover is a Code Coverage Tool
 *.dotCover
 
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
@@ -141,9 +167,9 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
+# Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
-#*.pubxml
+*.pubxml
 *.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to
@@ -154,12 +180,12 @@ PublishScripts/
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of Package Restore
-**/packages/*
+**/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
-!**/packages/build/
+!**/[Pp]ackages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
 *.nuget.props
 *.nuget.targets
 
@@ -176,6 +202,7 @@ AppPackages/
 BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
+*.appx
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
@@ -191,11 +218,13 @@ ClientBin/
 *.dbproj.schemaview
 *.jfm
 *.pfx
-*.crt
 *.publishsettings
-node_modules/
 orleans.codegen.cs
 
+# Including strong name files can present a security risk 
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
 # Since there are multiple workflows, uncomment next line to ignore bower_components
 # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
 #bower_components/
@@ -210,15 +239,19 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
 
 # SQL Server files
 *.mdf
 *.ldf
+*.ndf
 
 # Business Intelligence projects
 *.rdl.data
 *.bim.layout
 *.bim_*.settings
+*.rptproj.rsuser
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -228,13 +261,17 @@ FakesAssemblies/
 
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
+node_modules/
 
 # 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
@@ -261,11 +298,33 @@ paket-files/
 __pycache__/
 *.pyc
 
-# VS Code
-.vscode/
+# 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
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output 
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
 
-# NDepend
-NDependOut/
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
 
-# Build artifacts
-Test-*.XML
+# MFractors (Xamarin productivity tool) working folder 
+.mfractor/
diff --git a/README.md b/README.md
@@ -1,62 +1 @@
-# CluedIn.CSharp.Template
-
-Template containing common files and folder structure for creating new C# repositories.
-
-## Simple Usage
-
-1. To create a Git repository for a new C# project follow the steps below
-
-    ```Shell
-    # Clone the CSharp template repository and step into the new folder
-    git clone https://github.com/CluedIn-io/CluedIn.CSharp.Template.git CluedIn.ProjectName
-    cd CluedIn.ProjectName
-
-    # Rename the Git remote to template
-    git remote rename origin template
-    ```
-
-1. Rename the Visual Studio solution in the root folder
-
-    ```Shell
-    ren CluedIn.CSharp.Template.sln CluedIn.ProjectName.sln
-    ```
-
-1. Create the CluedIn.ProjectName repository under the CluedIn organization in GitHub
-
-1. Set the new GitHub repository as the _origin_ remote
-
-    ```Shell
-    git remote add origin https://github.com/CluedIn-io/CluedIn.ProjectName
-    ```
-
-1. Push the content to the new Git repository
-
-    ```Shell
-    git push
-    ```
-
-Substitute _CluedIn.ProjectName_ for your project name.
-
-## CluedIn Repository Code Migration
-
-To use this repository as a basis for migrating out an existing project from another repository use the instructions provided below.
-
-1. Create a feature branch to perform the code migration in
-
-    ```Shell
-    git checkout feature/Migrate-CluedIn-Repository-Code
-    ```
-
-1. Copy across code from source repository
-
-1. Convert projects to VS2017 format so that `dotnet` CLI can work with them
-
-    ```PowerShell
-    gci . *.csproj -recurse | ForEach-Object { dotnet migrate-2017 migrate $_.FullName }
-    ```
-
-1. Remove backup files
-
-    ```PowerShell
-    gci . backup* -Directory -recurse | remove-item -recurse -force -verbose
-    ```
+# CluedIn.Enricher.Permid
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -30,8 +30,8 @@ resources:
       endpoint: 'CluedIn-io'
 
 pool:
-  vmImage: 'VS2017-Win2016'
-  
+  vmImage: 'windows-latest'
+
 variables:
   Dotnet.Skip.First.Time.Experience: 'True'
   testFolderPath: '$(Build.SourcesDirectory)/test'

diff --git a/src/ExternalSearch.Providers.PermId.csproj b/src/ExternalSearch.Providers.PermId.csproj
@@ -4,12 +4,11 @@
     <RootNamespace>CluedIn.ExternalSearch.Providers.PermId</RootNamespace>
     <AssemblyName>CluedIn.ExternalSearch.Providers.PermId</AssemblyName>
     <TargetFramework>net452</TargetFramework>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <AssemblyTitle>ExternalSearch.Providers.PermId</AssemblyTitle>
     <Company>CluedIn</Company>
     <Product>ExternalSearch.Providers.PermId</Product>
     <Copyright>Copyright (c) 2019 Clued In. All rights reserved.</Copyright>
-    <OutputPath>..\bin\$(Configuration)\net452\ServerComponent\</OutputPath>
+    <OutputPath>bin\$(Configuration)</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>full</DebugType>
@@ -18,18 +17,27 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CluedIn.ExternalSearch" Version="2.4.0-alpha0094" />
+    <PackageReference Include="CluedIn.ExternalSearch" Version="2.4.0-alpha0100" />
     <PackageReference Include="domainname-parser" Version="999.1.15" />
     <PackageReference Include="EntityFramework" Version="6.1.2" />
     <PackageReference Include="Microsoft.Net.Http" Version="2.2.29" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="RestSharp" Version="105.2.3" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System.configuration" />
-    <Reference Include="System.IO.Compression" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Net.Http" />
   </ItemGroup>
+   <ItemGroup>
+    <PackageReference Include="CluedIn.ExternalSearch">
+      <Version>2.4.0-alpha0089</Version>
+    </PackageReference>
+    <PackageReference Include="MediaToolkit">
+      <Version>1.1.0.1</Version>
+    </PackageReference>
+    <PackageReference Include="SerilogAnalyzer">
+      <Version>0.15.0</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>