Skip to content

Commit

Permalink
Merge branch 'release/5.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@GeertvanHorrik
GeertvanHorrik committed Aug 25, 2021
2 parents e9b84fc + cfa105e commit aef1b50
Show file tree
Hide file tree
Showing 27 changed files with 349 additions and 258 deletions.
2 changes: 1 addition & 1 deletion deployment/cake/docker-tasks.cake
View file
Expand Up @@ -47,7 +47,7 @@ public class DockerImagesProcessor : ProcessorBase
var dockerRegistryUrl = GetDockerRegistryUrl(projectName);

var tag = string.Format("{0}/{1}:{2}", dockerRegistryUrl, GetDockerImageName(projectName), version);
return tag.ToLower();
return tag.TrimStart(' ', '/').ToLower();
}

private void ConfigureDockerSettings(AutoToolSettings dockerSettings)
Expand Down
2 changes: 1 addition & 1 deletion deployment/cake/generic-variables.cake
View file
@@ -1,6 +1,6 @@
#l "buildserver.cake"

#tool "nuget:?package=GitVersion.CommandLine&version=5.6.11"
#tool "nuget:?package=GitVersion.CommandLine&version=5.7.0"

//-------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion deployment/cake/github-pages-tasks.cake
View file
@@ -1,6 +1,6 @@
#l "github-pages-variables.cake"

#addin "nuget:?package=Cake.Git&version=1.0.1"
#addin "nuget:?package=Cake.Git&version=1.1.0"

//-------------------------------------------------------------

Expand Down
6 changes: 5 additions & 1 deletion deployment/cake/lib-msbuild.cake
View file
Expand Up @@ -262,11 +262,15 @@ private static string GetVisualStudioDirectory(BuildContext buildContext, bool?

var prereleasePaths = new List<KeyValuePair<string, string>>(new []
{
new KeyValuePair<string, string>("Visual Studio 2019 Preview", $@"{Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86)}\Microsoft Visual Studio\2019\Preview\")
new KeyValuePair<string, string>("Visual Studio 2022 Preview", $@"{Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles)}\Microsoft Visual Studio\2022\Preview\"),
new KeyValuePair<string, string>("Visual Studio 2019 Preview", $@"{Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86)}\Microsoft Visual Studio\2019\Preview\"),
});

var normalPaths = new List<KeyValuePair<string, string>> (new []
{
new KeyValuePair<string, string>("Visual Studio 2022 Enterprise", $@"{Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles)}\Microsoft Visual Studio\2022\Enterprise\"),
new KeyValuePair<string, string>("Visual Studio 2022 Professional", $@"{Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles)}\Microsoft Visual Studio\2022\Professional\"),
new KeyValuePair<string, string>("Visual Studio 2022 Community", $@"{Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles)}\Microsoft Visual Studio\2022\Community\"),
new KeyValuePair<string, string>("Visual Studio 2019 Enterprise", $@"{Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86)}\Microsoft Visual Studio\2019\Enterprise\"),
new KeyValuePair<string, string>("Visual Studio 2019 Professional", $@"{Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86)}\Microsoft Visual Studio\2019\Professional\"),
new KeyValuePair<string, string>("Visual Studio 2019 Community", $@"{Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86)}\Microsoft Visual Studio\2019\Community\"),
Expand Down
2 changes: 1 addition & 1 deletion deployment/cake/lib-octopusdeploy.cake
View file
@@ -1,4 +1,4 @@
#tool "nuget:?package=OctopusTools&version=7.4.3318"
#tool "nuget:?package=OctopusTools&version=7.4.3352"

public class OctopusDeployIntegration : IntegrationBase
{
Expand Down
60 changes: 1 addition & 59 deletions src/.vsconfig
View file
Expand Up @@ -4,7 +4,6 @@
"Microsoft.VisualStudio.Component.CoreEditor",
"Microsoft.VisualStudio.Workload.CoreEditor",
"Microsoft.VisualStudio.Component.NuGet",
"Microsoft.Net.Component.4.6.1.TargetingPack",
"Microsoft.VisualStudio.Component.Roslyn.Compiler",
"Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
"Microsoft.VisualStudio.Component.FSharp",
Expand All @@ -14,8 +13,6 @@
"Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions",
"Microsoft.VisualStudio.Component.DockerTools",
"Microsoft.NetCore.ComponentGroup.Web.2.1",
"Microsoft.Net.Component.4.7.2.SDK",
"Microsoft.Net.Component.4.7.2.TargetingPack",
"Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
"Microsoft.VisualStudio.Component.TypeScript.3.4",
"Microsoft.VisualStudio.Component.JavaScript.TypeScript",
Expand All @@ -31,23 +28,12 @@
"Microsoft.VisualStudio.Component.MSODBC.SQL",
"Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils",
"Microsoft.VisualStudio.Component.ManagedDesktop.Core",
"Microsoft.Net.Component.4.5.2.TargetingPack",
"Microsoft.Net.Component.4.5.TargetingPack",
"Microsoft.VisualStudio.Component.SQL.SSDT",
"Microsoft.VisualStudio.Component.SQL.DataSources",
"Component.Microsoft.Web.LibraryManager",
"Microsoft.VisualStudio.ComponentGroup.Web",
"Microsoft.VisualStudio.Component.Web",
"Microsoft.Net.Component.4.TargetingPack",
"Microsoft.Net.Component.4.5.1.TargetingPack",
"Microsoft.Net.Component.4.6.TargetingPack",
"Microsoft.Net.ComponentGroup.TargetingPacks.Common",
"Component.Microsoft.VisualStudio.Web.AzureFunctions",
"Microsoft.VisualStudio.ComponentGroup.AzureFunctions",
"Microsoft.VisualStudio.Component.Azure.Compute.Emulator",
"Microsoft.VisualStudio.Component.Azure.Storage.Emulator",
"Microsoft.VisualStudio.Component.Azure.ClientLibs",
"Microsoft.VisualStudio.Component.Azure.AuthoringTools",
"Microsoft.VisualStudio.Component.CloudExplorer",
"Microsoft.VisualStudio.Component.Debugger.TimeTravel",
"Microsoft.VisualStudio.Component.Debugger.Snapshot",
Expand All @@ -60,65 +46,21 @@
"Microsoft.VisualStudio.Component.AppInsights.Tools",
"Microsoft.VisualStudio.Component.WebDeploy",
"Microsoft.VisualStudio.Component.Debugger.JustInTime",
"Microsoft.Net.Component.4.6.1.SDK",
"Microsoft.Net.Component.4.6.2.SDK",
"Microsoft.Net.Component.4.6.2.TargetingPack",
"Microsoft.Net.Component.4.7.SDK",
"Microsoft.Net.Component.4.7.TargetingPack",
"Microsoft.Net.Component.4.7.1.SDK",
"Microsoft.Net.Component.4.7.1.TargetingPack",
"Microsoft.VisualStudio.Component.GraphDocument",
"Microsoft.VisualStudio.Component.CodeMap",
"Microsoft.VisualStudio.Workload.NetWeb",
"Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites",
"Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools",
"Microsoft.VisualStudio.Component.Azure.Waverton",
"Microsoft.Component.Azure.DataLake.Tools",
"Microsoft.VisualStudio.Component.Azure.Kubernetes.Tools",
"Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools",
"Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools",
"Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices",
"Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools",
"Microsoft.VisualStudio.Workload.Azure",
"Microsoft.VisualStudio.Component.VC.CoreIde",
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
"Microsoft.VisualStudio.Component.Windows10SDK.17763",
"Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
"Microsoft.ComponentGroup.Blend",
"Microsoft.VisualStudio.Component.PortableLibrary",
"Microsoft.VisualStudio.Workload.ManagedDesktop",
"Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
"Microsoft.VisualStudio.Component.ClassDesigner",
"Microsoft.VisualStudio.Component.VC.ATL",
"Microsoft.VisualStudio.Component.VC.ATLMFC",
"Microsoft.VisualStudio.Component.Windows10SDK.17134",
"Microsoft.VisualStudio.Component.Windows10SDK.16299",
"Microsoft.Component.NetFX.Native",
"Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard",
"Microsoft.VisualStudio.Component.Graphics",
"Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin",
"Microsoft.VisualStudio.ComponentGroup.UWP.Support",
"Microsoft.VisualStudio.Component.VC.Tools.ARM64",
"Microsoft.VisualStudio.Component.VC.Tools.ARM",
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
"Microsoft.VisualStudio.Workload.Universal",
"Component.OpenJDK",
"Microsoft.VisualStudio.Component.MonoDebugger",
"Microsoft.VisualStudio.Component.Merq",
"Component.Xamarin.RemotedSimulator",
"Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine",
"Component.Xamarin",
"Component.Android.SDK27",
"Microsoft.VisualStudio.Workload.NetCrossPlat",
"Microsoft.Component.CodeAnalysis.SDK",
"Microsoft.VisualStudio.Component.VC.ATL.ARM",
"Microsoft.VisualStudio.Component.VC.ATL.ARM64",
"Microsoft.VisualStudio.Component.VC.MFC.ARM",
"Microsoft.VisualStudio.Component.VC.MFC.ARM64",
"Microsoft.VisualStudio.Component.VC.v141.ATL.ARM64",
"Microsoft.VisualStudio.Component.VC.v141.ATL",
"Microsoft.VisualStudio.Component.VC.v141.MFC.ARM",
"Microsoft.VisualStudio.Component.VC.v141.MFC.ARM64",
"Microsoft.VisualStudio.Component.VC.v141.MFC"
"Microsoft.Component.CodeAnalysis.SDK"
]
}
6 changes: 5 additions & 1 deletion src/Costura.Fody.IntegrationTests/Costura.Fody.IntegrationTests.csproj
View file
Expand Up @@ -14,11 +14,15 @@
<ItemGroup>
<PackageReference Include="Catel.Core" Version="5.12.18" PrivateAssets="All" />
<PackageReference Include="Fody" Version="6.5.2" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" PrivateAssets="All" />
<PackageReference Include="NUnit" Version="3.13.2" PrivateAssets="all" />
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Costura\Costura.csproj" />
</ItemGroup>

<ItemGroup>
<WeaverFiles Include="$(OverridableOutputRootPath)\Costura.Fody\netstandard2.0\Costura.Fody.dll" />
Expand Down
2 changes: 1 addition & 1 deletion src/Costura.Fody.IntegrationTests/FodyWeavers.xml
View file
@@ -1,3 +1,3 @@
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<Costura IncludeAssemblies="Catel.Core" DisableCleanup="false" />
<Costura IncludeAssemblies="Catel.Core" DisableCleanup="false" LoadAtModuleInit="false" />
</Weavers>
5 changes: 5 additions & 0 deletions src/Costura.Fody.IntegrationTests/Integration.cs
View file
Expand Up @@ -6,6 +6,11 @@
[TestFixture]
public class Integration
{
static Integration()
{
CosturaUtility.Initialize();
}

[Test, Explicit]
public void Test()
{
Expand Down
3 changes: 1 addition & 2 deletions src/Costura.Fody.Tests/BaseCosturaTest.cs
View file
@@ -1,5 +1,4 @@
using System;
using Fody;
using Fody;
using NUnit.Framework;

[TestFixture]
Expand Down
107 changes: 53 additions & 54 deletions ...sts/BasicTests.TemplateHasCorrectSymbols.ForScenario.TempFileTests.net.debug.approved.txt
View file
Expand Up @@ -797,16 +797,14 @@ IL_0067: br.s IL_0069
IL_0069: ldloc.s V_5
IL_006b: ret
}
.method private hidebysig static pinvokeimpl("kernel32.dll" unicode lasterr winapi)
bool SetDllDirectory(string lpPathName) cil managed preservesig
{
}
.method private hidebysig static pinvokeimpl("kernel32.dll" winapi)
uint32 SetErrorMode(uint32 uMode) cil managed preservesig
{
}
.method private hidebysig static pinvokeimpl("kernel32" unicode lasterr winapi)
native int LoadLibrary(string dllToLoad) cil managed preservesig
native int LoadLibraryEx(string lpFileName,
native int hReservedNull,
uint32 dwFlags) cil managed preservesig
{
}
.method private hidebysig static void InternalPreloadUnmanagedLibraries(string tempBasePath,
Expand Down Expand Up @@ -937,63 +935,64 @@ IL_00bf: callvirt instance void [mscorlib]System.IDisposable::Dispose()
IL_00c4: nop
IL_00c5: endfinally
} // end handler
IL_00c6: ldarg.0
IL_00c7: call bool Costura.AssemblyLoader::SetDllDirectory(string)
IL_00cc: pop
IL_00cd: ldc.i4 0x8003
IL_00d2: stloc.1
IL_00d3: ldloc.1
IL_00d4: call uint32 Costura.AssemblyLoader::SetErrorMode(uint32)
IL_00d9: stloc.2
IL_00da: nop
IL_00db: ldarg.1
IL_00dc: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1<!0> class [mscorlib]System.Collections.Generic.IEnumerable`1<string>::GetEnumerator()
IL_00e1: stloc.s V_12
IL_00c6: ldc.i4 0x8003
IL_00cb: stloc.1
IL_00cc: ldloc.1
IL_00cd: call uint32 Costura.AssemblyLoader::SetErrorMode(uint32)
IL_00d2: stloc.2
IL_00d3: nop
IL_00d4: ldarg.1
IL_00d5: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1<!0> class [mscorlib]System.Collections.Generic.IEnumerable`1<string>::GetEnumerator()
IL_00da: stloc.s V_12
.try
{
IL_00e3: br.s IL_011c
IL_00e5: ldloc.s V_12
IL_00e7: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1<string>::get_Current()
IL_00ec: stloc.s V_13
IL_00ee: nop
IL_00ef: ldloc.s V_13
IL_00f1: call string Costura.AssemblyLoader::ResourceNameToPath(string)
IL_00f6: stloc.0
IL_00f7: ldloc.0
IL_00f8: ldstr ".dll"
IL_00fd: callvirt instance bool [mscorlib]System.String::EndsWith(string)
IL_0102: stloc.s V_14
IL_0104: ldloc.s V_14
IL_0106: brfalse.s IL_011b
IL_0108: nop
IL_0109: ldarg.0
IL_010a: ldloc.0
IL_010b: call string [mscorlib]System.IO.Path::Combine(string,
IL_00dc: br.s IL_011b
IL_00de: ldloc.s V_12
IL_00e0: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1<string>::get_Current()
IL_00e5: stloc.s V_13
IL_00e7: nop
IL_00e8: ldloc.s V_13
IL_00ea: call string Costura.AssemblyLoader::ResourceNameToPath(string)
IL_00ef: stloc.0
IL_00f0: ldloc.0
IL_00f1: ldstr ".dll"
IL_00f6: callvirt instance bool [mscorlib]System.String::EndsWith(string)
IL_00fb: stloc.s V_14
IL_00fd: ldloc.s V_14
IL_00ff: brfalse.s IL_011a
IL_0101: nop
IL_0102: ldarg.0
IL_0103: ldloc.0
IL_0104: call string [mscorlib]System.IO.Path::Combine(string,
string)
IL_0110: stloc.s V_15
IL_0112: ldloc.s V_15
IL_0114: call native int Costura.AssemblyLoader::LoadLibrary(string)
IL_0119: pop
IL_0109: stloc.s V_15
IL_010b: ldloc.s V_15
IL_010d: ldsfld native int [mscorlib]System.IntPtr::Zero
IL_0112: ldc.i4.8
IL_0113: call native int Costura.AssemblyLoader::LoadLibraryEx(string,
native int,
uint32)
IL_0118: pop
IL_0119: nop
IL_011a: nop
IL_011b: nop
IL_011c: ldloc.s V_12
IL_011e: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext()
IL_0123: brtrue.s IL_00e5
IL_0125: leave.s IL_0134
IL_011b: ldloc.s V_12
IL_011d: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext()
IL_0122: brtrue.s IL_00de
IL_0124: leave.s IL_0133
} // end .try
finally
{
IL_0127: ldloc.s V_12
IL_0129: brfalse.s IL_0133
IL_012b: ldloc.s V_12
IL_012d: callvirt instance void [mscorlib]System.IDisposable::Dispose()
IL_0132: nop
IL_0133: endfinally
IL_0126: ldloc.s V_12
IL_0128: brfalse.s IL_0132
IL_012a: ldloc.s V_12
IL_012c: callvirt instance void [mscorlib]System.IDisposable::Dispose()
IL_0131: nop
IL_0132: endfinally
} // end handler
IL_0134: ldloc.2
IL_0135: call uint32 Costura.AssemblyLoader::SetErrorMode(uint32)
IL_013a: pop
IL_013b: ret
IL_0133: ldloc.2
IL_0134: call uint32 Costura.AssemblyLoader::SetErrorMode(uint32)
IL_0139: pop
IL_013a: ret
}
.method private hidebysig static void PreloadUnmanagedLibraries(string hash,
string tempBasePath,
Expand Down

0 comments on commit aef1b50

Please sign in to comment.