diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2548415ed8..49f4d17734 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -97,19 +97,3 @@ jobs: artifactName: packages artifactType: Container parallel: true - - # UNDONE: Blocked by NuGet/Home#7341 - #- job: macOS - # pool: - # vmImage: macOS-10.13 - # steps: - # - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine - # name: Build - - # UNDONE: Blocked by dsplaisted/ReferenceAssemblyPackages#2 - #- job: Linux - # pool: - # vmImage: ubuntu-16.04 - # steps: - # - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine - # name: Build diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh old mode 100644 new mode 100755 diff --git a/test/EntityFramework/FunctionalTests.Transitional/FunctionalTests.Transitional.csproj b/test/EntityFramework/FunctionalTests.Transitional/FunctionalTests.Transitional.csproj index 209a58012f..479c598eb9 100644 --- a/test/EntityFramework/FunctionalTests.Transitional/FunctionalTests.Transitional.csproj +++ b/test/EntityFramework/FunctionalTests.Transitional/FunctionalTests.Transitional.csproj @@ -34,28 +34,28 @@ </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'net452'"> - <Compile Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\content\SqlServerTypes\Loader.cs"> + <Compile Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\content\SqlServerTypes\Loader.cs"> <Link>SqlServerTypes\Loader.cs</Link> </Compile> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'net452'"> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\content\readme.htm"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\content\readme.htm"> <Link>SqlServerTypes\readme.htm</Link> </Content> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x64\msvcr120.dll"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x64\msvcr120.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>SqlServerTypes\x64\msvcr120.dll</Link> </Content> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x64\SqlServerSpatial140.dll"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x64\SqlServerSpatial140.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>SqlServerTypes\x64\SqlServerSpatial140.dll</Link> </Content> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x86\msvcr120.dll"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x86\msvcr120.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>SqlServerTypes\x86\msvcr120.dll</Link> </Content> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x86\SqlServerSpatial140.dll"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x86\SqlServerSpatial140.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>SqlServerTypes\x86\SqlServerSpatial140.dll</Link> </Content> diff --git a/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/ResourceUtilities.cs b/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/ResourceUtilities.cs index be27407b9f..513446010c 100644 --- a/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/ResourceUtilities.cs +++ b/test/EntityFramework/FunctionalTests.Transitional/TestHelpers/ResourceUtilities.cs @@ -79,11 +79,10 @@ public static void CopyEmbeddedResourcesToCurrentDir( { Debug.Assert(sourceStream != null, "Could not create stream for embedded resource " + prefix + name); - var destinationPath = Path.Combine(@".\", name); - if (!File.Exists(destinationPath) || overwrite) + if (!File.Exists(name) || overwrite) { using ( - var destinationStream = new FileStream(destinationPath, FileMode.Create, FileAccess.Write)) + var destinationStream = new FileStream(name, FileMode.Create, FileAccess.Write)) { var sourceBuffer = new byte[sourceStream.Length]; sourceStream.Read(sourceBuffer, 0, sourceBuffer.Length); diff --git a/test/EntityFramework/FunctionalTests/FunctionalTests.csproj b/test/EntityFramework/FunctionalTests/FunctionalTests.csproj index 2114b0d480..755756e54f 100644 --- a/test/EntityFramework/FunctionalTests/FunctionalTests.csproj +++ b/test/EntityFramework/FunctionalTests/FunctionalTests.csproj @@ -25,22 +25,22 @@ </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'net452'"> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\content\readme.htm"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\content\readme.htm"> <Link>SqlServerTypes\readme.htm</Link> </Content> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x64\msvcr120.dll"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x64\msvcr120.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>SqlServerTypes\x64\msvcr120.dll</Link> </Content> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x64\SqlServerSpatial140.dll"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x64\SqlServerSpatial140.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>SqlServerTypes\x64\SqlServerSpatial140.dll</Link> </Content> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x86\msvcr120.dll"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x86\msvcr120.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>SqlServerTypes\x86\msvcr120.dll</Link> </Content> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x86\SqlServerSpatial140.dll"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x86\SqlServerSpatial140.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>SqlServerTypes\x86\SqlServerSpatial140.dll</Link> </Content> diff --git a/test/EntityFramework/VBTests/TranslatorTests.vb b/test/EntityFramework/VBTests/TranslatorTests.vb index 304199a2a3..365e85a4b9 100644 --- a/test/EntityFramework/VBTests/TranslatorTests.vb +++ b/test/EntityFramework/VBTests/TranslatorTests.vb @@ -30,7 +30,8 @@ Public Class TranslatorTests " [Extent1].[Id] AS [Id]" & vbCrLf & " FROM [dbo].[Entities] AS [Extent1]" & vbCrLf & " WHERE (POWER( CAST( [Extent1].[Id] AS float), cast(2 as float(53)))) < cast(30 as float(53))", - query.ToString()) + query.ToString(), + ignoreLineEndingDifferences:=True) End Using End Sub @@ -44,7 +45,8 @@ Public Class TranslatorTests " [Extent1].[Id] AS [Id]" & vbCrLf & " FROM [dbo].[Entities] AS [Extent1]" & vbCrLf & " WHERE (POWER( CAST( [Extent1].[Id] AS float), cast(2 as float(53)))) < cast(30 as float(53))", - query.ToString()) + query.ToString(), + ignoreLineEndingDifferences:=True) End Using End Sub diff --git a/test/EntityFramework/VBTests/VBTests.vbproj b/test/EntityFramework/VBTests/VBTests.vbproj index 89dc97b781..b9bb83e6e8 100644 --- a/test/EntityFramework/VBTests/VBTests.vbproj +++ b/test/EntityFramework/VBTests/VBTests.vbproj @@ -5,33 +5,33 @@ <AssemblyName>EntityFramework.VBTests</AssemblyName> <TargetFrameworks>net452;netcoreapp3.0</TargetFrameworks> </PropertyGroup> - + <ItemGroup Condition="'$(TargetFramework)' == 'net452'"> <Reference Include="System.Transactions" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'net452'"> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\content\readme.htm"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\content\readme.htm"> <Link>SqlServerTypes\readme.htm</Link> </Content> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x64\msvcr120.dll"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x64\msvcr120.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>SqlServerTypes\x64\msvcr120.dll</Link> </Content> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x64\SqlServerSpatial140.dll"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x64\SqlServerSpatial140.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>SqlServerTypes\x64\SqlServerSpatial140.dll</Link> </Content> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x86\msvcr120.dll"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x86\msvcr120.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>SqlServerTypes\x86\msvcr120.dll</Link> </Content> - <Content Include="$(NuGetPackageRoot)Microsoft.SqlServer.Types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x86\SqlServerSpatial140.dll"> + <Content Include="$(NuGetPackageRoot)microsoft.sqlserver.types\$(MicrosoftSqlServerTypesVersion)\nativeBinaries\x86\SqlServerSpatial140.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>SqlServerTypes\x86\SqlServerSpatial140.dll</Link> </Content> </ItemGroup> - + <ItemGroup> <Compile Update="VbAdvancedPatterns\AddressMf.vb"> <DependentUpon>VbAdvancedPatterns.tt</DependentUpon> @@ -195,7 +195,7 @@ <AutoGen>True</AutoGen> </Compile> </ItemGroup> - + <ItemGroup> <None Update="VbAdvancedPatterns\VbAdvancedPatterns.Context.tt"> <Generator>TextTemplatingFileGenerator</Generator> @@ -216,12 +216,12 @@ <LastGenOutput>VbMonsterModel.vb</LastGenOutput> </None> </ItemGroup> - + <ItemGroup> <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" /> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> - + <ItemGroup> <ProjectReference Include="..\FunctionalTests\FunctionalTests.csproj" /> </ItemGroup>